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
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 81cfb70..a3aeb6d 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -337,6 +337,11 @@
TEST_ART_BROKEN_GCSTRESS_RUN_TESTS :=
+# b/26320300: multi image is broken and 119-noimage-patchoat fails because of it.
+ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,target,$(RUN_TYPES),$(PREBUILD_TYPES),$(COMPILER_TYPES), \
+ $(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES),$(IMAGE_TYPES),$(PICTEST_TYPES),$(DEBUGGABLE_TYPES), 119-noimage-patchoat, \
+ $(ALL_ADDRESS_SIZES))
+
# 115-native-bridge setup is complicated. Need to implement it correctly for the target.
ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,target,$(RUN_TYPES),$(PREBUILD_TYPES),$(COMPILER_TYPES), \
$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES),$(IMAGE_TYPES),$(PICTEST_TYPES),$(DEBUGGABLE_TYPES), 115-native-bridge, \
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.
