diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-30 17:41:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-29 21:36:05 +0000 |
| commit | 01a0ebb6b96c32879dcad99d515fc0cd8de2a266 (patch) | |
| tree | 911b256376844492d2acd44873b0828e0f3aa163 | |
| parent | ef57ed72a3ac856f6115ae89c609d4fd892e8c41 (diff) | |
| parent | fc0082be5e28eda30833ad627409d94ccf1bfed2 (diff) | |
| download | art-01a0ebb6b96c32879dcad99d515fc0cd8de2a266.zip art-01a0ebb6b96c32879dcad99d515fc0cd8de2a266.tar.gz art-01a0ebb6b96c32879dcad99d515fc0cd8de2a266.tar.bz2 | |
Merge "Make 32bit run-tests work correctly on 64bit default devices."
| -rwxr-xr-x | test/etc/push-and-run-prebuilt-test-jar | 6 | ||||
| -rwxr-xr-x | test/etc/push-and-run-test-jar | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/test/etc/push-and-run-prebuilt-test-jar b/test/etc/push-and-run-prebuilt-test-jar index 2b9604b..ad23edf 100755 --- a/test/etc/push-and-run-prebuilt-test-jar +++ b/test/etc/push-and-run-prebuilt-test-jar @@ -23,7 +23,8 @@ QUIET="n" DEV_MODE="n" INVOKE_WITH="" FLAGS="" -TARGET_SUFFIX="" +TARGET_SUFFIX="32" +GDB_TARGET_SUFFIX="" COMPILE_FLAGS="" while true; do @@ -100,6 +101,7 @@ while true; do break elif [ "x$1" = "x--64" ]; then TARGET_SUFFIX="64" + GDB_TARGET_SUFFIX="64" ARCHITECTURES_PATTERN="${ARCHITECTURES_64}" shift elif expr "x$1" : "x--" >/dev/null 2>&1; then @@ -165,7 +167,7 @@ if [ "$DEBUGGER" = "y" ]; then fi if [ "$GDB" = "y" ]; then - gdb="gdbserver$TARGET_SUFFIX :5039" + gdb="gdbserver$GDB_TARGET_SUFFIX :5039" gdbargs="$exe" fi diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar index 776a011..06075c2 100755 --- a/test/etc/push-and-run-test-jar +++ b/test/etc/push-and-run-test-jar @@ -20,7 +20,8 @@ QUIET="n" DEV_MODE="n" INVOKE_WITH="" FLAGS="" -TARGET_SUFFIX="" +TARGET_SUFFIX="32" +GDB_TARGET_SUFFIX="" while true; do if [ "x$1" = "x--quiet" ]; then @@ -94,6 +95,7 @@ while true; do break elif [ "x$1" = "x--64" ]; then TARGET_SUFFIX="64" + GDB_TARGET_SUFFIX="64" shift elif expr "x$1" : "x--" >/dev/null 2>&1; then echo "unknown $0 option: $1" 1>&2 @@ -152,7 +154,7 @@ if [ "$DEBUGGER" = "y" ]; then fi if [ "$GDB" = "y" ]; then - gdb="gdbserver$TARGET_SUFFIX :5039" + gdb="gdbserver$GDB_TARGET_SUFFIX :5039" gdbargs="$exe" fi |