diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-04 09:04:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-04 09:04:45 +0000 |
| commit | e6b73ea6719a2c91433b560fd3441d79945edc18 (patch) | |
| tree | da5c3b7d182604d12f1e9d6109660fd5b634bcd0 /test/run-test | |
| parent | d415572117cbfc12f78c7d1c5844a7b62e68a2ff (diff) | |
| parent | 5fd18ba0902df62c4e1237712f03c44b8109ce8a (diff) | |
| download | art-e6b73ea6719a2c91433b560fd3441d79945edc18.zip art-e6b73ea6719a2c91433b560fd3441d79945edc18.tar.gz art-e6b73ea6719a2c91433b560fd3441d79945edc18.tar.bz2 | |
Merge "Merge push-and-run-{prebuilt}-test-jar files."
Diffstat (limited to 'test/run-test')
| -rwxr-xr-x | test/run-test | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/test/run-test b/test/run-test index f11580e..f9f45fc 100755 --- a/test/run-test +++ b/test/run-test @@ -119,9 +119,11 @@ while true; do relocate="no" shift elif [ "x$1" = "x--prebuild" ]; then + run_args="${run_args} --prebuild" prebuild_mode="yes" shift; elif [ "x$1" = "x--no-prebuild" ]; then + run_args="${run_args} --no-prebuild" prebuild_mode="no" shift; elif [ "x$1" = "x--gcverify" ]; then @@ -264,13 +266,6 @@ if [ "$target_mode" = "no" ]; then fi else RUN="${progdir}/etc/host-run-test-jar" - if [ "$prebuild_mode" = "yes" ]; then - run_args="${run_args} --prebuild" - fi - fi -else - if [ "$prebuild_mode" = "yes" ]; then - RUN="${progdir}/etc/push-and-run-prebuilt-test-jar" fi fi |