diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-08-13 03:40:45 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-08-14 17:18:53 +0100 |
| commit | 54accbca0b549b1b1ad3ef09655dad438bc1e104 (patch) | |
| tree | 6354bddae9e09476380b9351b6c1a84636ac8154 /test/116-nodex2oat | |
| parent | e39a5e1ced3d2b87974c646678dd719c02a9a010 (diff) | |
| download | art-54accbca0b549b1b1ad3ef09655dad438bc1e104.tar.gz art-54accbca0b549b1b1ad3ef09655dad438bc1e104.tar.bz2 art-54accbca0b549b1b1ad3ef09655dad438bc1e104.zip | |
Fix bugs in the x86 and arm versions of generic JNI.
Also fix the run script of 116-nodex2oat to use the non-prebuild
script for target.
Bug: 17000769
Change-Id: I439fcd710fb8bb408f3288ff8fb34fef23890adb
Diffstat (limited to 'test/116-nodex2oat')
| -rwxr-xr-x | test/116-nodex2oat/run | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/116-nodex2oat/run b/test/116-nodex2oat/run index 5ffeecdbb1..2df670575d 100755 --- a/test/116-nodex2oat/run +++ b/test/116-nodex2oat/run @@ -17,6 +17,9 @@ # Remove prebuild from the flags, this test is for testing not having oat files. flags="${@/--prebuild/}" +# Use the non-prebuild script. +RUN="${RUN/push-and-run-prebuilt-test-jar/push-and-run-test-jar}" + # Make sure we can run without an oat file, echo "Run -Xnodex2oat" ${RUN} ${flags} --runtime-option -Xnodex2oat |