diff options
| author | 2016-01-22 19:12:18 +0000 | |
|---|---|---|
| committer | 2016-01-22 19:12:18 +0000 | |
| commit | 2d0582b6c96cf16e18df50158494e32eeede0a95 (patch) | |
| tree | dcdf5e9baaa89b82515652d5abffa2712bc9b3ca | |
| parent | 95005291d8ebdd1d2ac58ffc5181fef4fbbf2383 (diff) | |
| parent | 4694e82d0062fa6fabb18f3ada5c4e32499f7078 (diff) | |
Merge "Raise ulimit for run-test 961."
| -rw-r--r-- | test/Android.run-test.mk | 5 | ||||
| -rwxr-xr-x | test/run-test | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 48e10c3378..36dd9f4ea7 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -621,11 +621,6 @@ ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES), 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 033e2c6467..faa597e1ca 100755 --- a/test/run-test +++ b/test/run-test @@ -733,7 +733,10 @@ fi # 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 |