commit b8012103855f50651bbe2e6d5f2ff3079afccbc9
author Alex Light <allight@google.com> Wed Nov 13 01:41:04 2019 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 13 20:55:58 2019 +0000
tree 085fc7431f9856ae55a1bc0385092043186895d9
parent 94fd9eaee76e862932dded6583a9c052e5aa9efc

Revert^2 "Correctly quote -Xbootclasspath argument in run-test-jar"

This reverts commit a8a17a4b92b290892627f0ccc38973c847e0a7fb.

This limits the quoting to only --gdbserver, which is the one case
where we know there is a problem with the glob characters.

Reason for revert: Fixed issue causing debug-gc to fail
Test: ./test.py --host
Test: ./test/testrunner/run_build_test_target.py art-debug-gc
Test: ./test/run-test --host --strace --64 001-HelloWorld

Change-Id: I60f40d21b08b0514c24ac6a3db260aad19a539b8

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 129c8c5..e09fcb2 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -953,6 +953,13 @@
   TMP_DIR_OPTION="-Djava.io.tmpdir=/data/local/tmp"
 fi
 
+# The build servers have an ancient version of bash so we cannot use @Q.
+if [ "$USE_GDBSERVER" == "y" ]; then
+  printf -v QUOTED_DALVIKVM_BOOT_OPT "%q" "$DALVIKVM_BOOT_OPT"
+else
+  QUOTED_DALVIKVM_BOOT_OPT="$DALVIKVM_BOOT_OPT"
+fi
+
 # We set DumpNativeStackOnSigQuit to false to avoid stressing libunwind.
 # b/27185632
 # b/24664297
@@ -967,7 +974,7 @@
                   $JNI_OPTS \
                   $INT_OPTS \
                   $DEBUGGER_OPTS \
-                  $DALVIKVM_BOOT_OPT \
+                  ${QUOTED_DALVIKVM_BOOT_OPT} \
                   $TMP_DIR_OPTION \
                   -XX:DumpNativeStackOnSigQuit:false \
                   -cp $DEX_LOCATION/$TEST_NAME.jar$SECONDARY_DEX $MAIN $ARGS"