From c525604b313bb77a2077e1fec43dfab76cb1b9b1 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Sat, 26 Dec 2015 19:41:37 +0000
Subject: [PATCH] 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/Android.run-test.mk | 5 +++++
 test/etc/run-test-jar    | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 81cfb7003..a3aeb6d9d 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -337,6 +337,11 @@ endif
 
 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 6ff356faa..dacb7b9d3 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -394,6 +394,12 @@ if [ "x$INSTRUCTION_SET_FEATURES" != "x" ] ; then
   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 @@ dalvikvm_cmdline="$INVOKE_WITH $GDB $ANDROID_ROOT/bin/$DALVIKVM \
                   $INT_OPTS \
                   $DEBUGGER_OPTS \
                   $DALVIKVM_BOOT_OPT \
+                  $TMP_DIR_OPTION \
                   -cp $DEX_LOCATION/$TEST_NAME.jar$SECONDARY_DEX $MAIN $ARGS"
 
 # Remove whitespace.
-- 
2.11.0