commit 2fe07927610177e9b83809e5bdb6d2b3d835a076
author Andreas Gampe <agampe@google.com> Mon Apr 21 07:50:39 2014 -0700
committer Andreas Gampe <agampe@google.com> Mon Apr 21 09:29:39 2014 -0700
tree f873d2314a800c4bb5400f17701058fbd2c259b4
parent 9b3335e3503724dbcb492e159789adf98ae3958b

Fix dependencies in the test suite for multi-target tests

Change-Id: I94dd767490a7cd8cceddc158d90f56f5bd3fef26

test/run-test

diff --git a/test/run-test b/test/run-test
index 58de980..6e59641 100755
--- a/test/run-test
+++ b/test/run-test
@@ -68,6 +68,7 @@
 runtime="art"
 usage="no"
 build_only="no"
+suffix64=""
 
 while true; do
     if [ "x$1" = "x--host" ]; then
@@ -154,6 +155,7 @@
         shift
     elif [ "x$1" = "x--64" ]; then
         run_args="${run_args} --64"
+        suffix64="64"
         shift
     elif expr "x$1" : "x--" >/dev/null 2>&1; then
         echo "unknown $0 option: $1" 1>&2
@@ -187,7 +189,7 @@
         fi
         run_args="${run_args} --boot -Ximage:${ANDROID_HOST_OUT}/framework/core.art"
     else
-        run_args="${run_args} --boot -Ximage:/data/art-test/core.art"
+        run_args="${run_args} --boot -Ximage:/data/art-test${suffix64}/core.art"
     fi
 fi