Raise ulimit for run-test 961.
Run-test 961 was rubbing against the ulimit, causing spurious
failures. This raises the ulimit the test runs under.
Bug: 26733951
Change-Id: I43f7c5f8e5e9e23ed139bd1fcc6bf24c526c546b
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 48e10c3..36dd9f4 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -621,11 +621,6 @@
TEST_ART_BROKEN_MULTI_IMAGE_RUN_TESTS :=
-# Test is flaky b/26733951.
-ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \
- $(COMPILER_TYPES),$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES),$(IMAGE_TYPES), \
- $(PICTEST_TYPES),$(DEBUGGABLE_TYPES),961-default-iface-resolution-generated,$(ALL_ADDRESS_SIZES))
-
# Clear variables ahead of appending to them when defining tests.
$(foreach target, $(TARGET_TYPES), $(eval ART_RUN_TEST_$(call name-to-var,$(target))_RULES :=))
$(foreach target, $(TARGET_TYPES), \
diff --git a/test/run-test b/test/run-test
index 033e2c6..faa597e 100755
--- a/test/run-test
+++ b/test/run-test
@@ -733,7 +733,10 @@
# To cause tests to fail fast, limit the file sizes created by dx, dex2oat and ART output to 2MB.
build_file_size_limit=2048
run_file_size_limit=2048
-if echo "$test_dir" | grep -Eq "(083|089|964|971)" > /dev/null; then
+
+# Add tests requiring a higher ulimit to this list. Ulimits might need to be raised to deal with
+# large amounts of expected output or large generated files.
+if echo "$test_dir" | grep -Eq "(083|089|961|964|971)" > /dev/null; then
build_file_size_limit=5120
run_file_size_limit=5120
fi