diff options
author | Elliott Hughes <enh@google.com> | 2012-06-18 16:34:20 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2012-06-18 16:48:16 -0700 |
commit | 7ab3a2a963669ae94e2d0cd5d9f9dda2f4c85835 (patch) | |
tree | 39e0d043d150cd9893b25e1f4498c91e6f00a814 /test | |
parent | 91117af42e3730ec231a898e416bfd954138d8e3 (diff) | |
download | art-7ab3a2a963669ae94e2d0cd5d9f9dda2f4c85835.zip art-7ab3a2a963669ae94e2d0cd5d9f9dda2f4c85835.tar.gz art-7ab3a2a963669ae94e2d0cd5d9f9dda2f4c85835.tar.bz2 |
Fix run-test 089 (which has no files to delete).
Change-Id: Ibaf542f4332ea722be17fd4ef29689c17d8f282a
Diffstat (limited to 'test')
-rwxr-xr-x | test/run-test | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/run-test b/test/run-test index 8d7198f..7a97479 100755 --- a/test/run-test +++ b/test/run-test @@ -206,10 +206,13 @@ export TEST_NAME=`basename ${test_dir}` good="no" if [ "$dev_mode" = "yes" ]; then "./${build}" 2>&1 - echo "build exit status: $?" 1>&2 - "./${run}" $run_args "$@" 2>&1 - echo "run exit status: $?" 1>&2 - good="yes" + build_exit="$?" + echo "build exit status: $build_exit" 1>&2 + if [ "$build_exit" = '0' ]; then + "./${run}" $run_args "$@" 2>&1 + echo "run exit status: $?" 1>&2 + good="yes" + fi elif [ "$update_mode" = "yes" ]; then "./${build}" >"$build_output" 2>&1 build_exit="$?" @@ -241,7 +244,7 @@ fi if [ "$good" = "yes" ]; then cd "$oldwd" rm -rf "$tmp_dir" - if [ "$target_mode" = "yes" ]; then + if [ "$target_mode" = "yes" -a "$build_exit" = "0" ]; then adb shell rm -r $DEX_LOCATION fi exit 0 |