diff options
| -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 2b9604b515..ad23edff29 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 776a01146d..06075c2619 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 |