commit c525604b313bb77a2077e1fec43dfab76cb1b9b1
author Nicolas Geoffray <ngeoffray@google.com> Sat Dec 26 19:41:37 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Sat Dec 26 19:43:25 2015 +0000
tree 496d3caa89dfe6432582d1cb47b6b5cf528e2768
parent fed399c39a89a04966cf9c7da300c8a1d6404453

Tweaks to get run-test working after enso.

- test 119 temporarily disabled
- set java.io.tmpdir in the command line for target

bug:26320300

Change-Id: I9ddeac4f23f065eea62511f9fa392ea4764d0435

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 6ff356f..dacb7b9 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -394,6 +394,12 @@
   DALVIKVM_ISA_FEATURES_ARGS="-Xcompiler-option --instruction-set-features=${INSTRUCTION_SET_FEATURES}"
 fi
 
+# java.io.tmpdir can only be set at launch time.
+TMP_DIR_OPTION=""
+if [ "$HOST" = "n" ]; then
+  TMP_DIR_OPTION="-Djava.io.tmpdir=/data/local/tmp"
+fi
+
 dalvikvm_cmdline="$INVOKE_WITH $GDB $ANDROID_ROOT/bin/$DALVIKVM \
                   $GDB_ARGS \
                   $FLAGS \
@@ -407,6 +413,7 @@
                   $INT_OPTS \
                   $DEBUGGER_OPTS \
                   $DALVIKVM_BOOT_OPT \
+                  $TMP_DIR_OPTION \
                   -cp $DEX_LOCATION/$TEST_NAME.jar$SECONDARY_DEX $MAIN $ARGS"
 
 # Remove whitespace.