commit a8a17a4b92b290892627f0ccc38973c847e0a7fb
author Alex Light <allight@google.com> Wed Nov 13 01:37:32 2019 +0000
committer Alex Light <allight@google.com> Wed Nov 13 01:39:32 2019 +0000
tree 4a21892770798756ab9b8846685e5438e6010920
parent 682715ee1448959801640975005abb8b876b80b3

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

This reverts commit cb809bb89eca9889a7ad443372e6a918f3c14650.

Reason for revert: failing debug-gc it seems.

Change-Id: I7f56e22a7075a4160d9082cb8fcb8b414cd67607
Test: None

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index bb38c12..129c8c5 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -953,13 +953,6 @@
   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 [ "$INVOKE_WITH" == "" ] && [ "$GDB" == "" ]; then
-  QUOTED_DALVIKVM_BOOT_OPT="$DALVIKVM_BOOT_OPT"
-else
-  printf -v QUOTED_DALVIKVM_BOOT_OPT '%q' "$DALVIKVM_BOOT_OPT"
-fi
-
 # We set DumpNativeStackOnSigQuit to false to avoid stressing libunwind.
 # b/27185632
 # b/24664297
@@ -974,7 +967,7 @@
                   $JNI_OPTS \
                   $INT_OPTS \
                   $DEBUGGER_OPTS \
-                  ${QUOTED_DALVIKVM_BOOT_OPT} \
+                  $DALVIKVM_BOOT_OPT \
                   $TMP_DIR_OPTION \
                   -XX:DumpNativeStackOnSigQuit:false \
                   -cp $DEX_LOCATION/$TEST_NAME.jar$SECONDARY_DEX $MAIN $ARGS"