Revert "Revert "Unfortunately, the test still hits too many run failures.""
This reverts commit f8069a217312e486d034cb850e41639580b7385f.
Change-Id: I6359908ef1a2a7927b52d1fd993ef1b5873aa172
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index a6f31b4..3c6c058 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -177,6 +177,15 @@
TEST_ART_TIMING_SENSITIVE_RUN_TESTS :=
+TEST_ART_BROKEN_RUN_TESTS := \
+ 004-ThreadStress
+
+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), $(TEST_ART_BROKEN_RUN_TESTS), $(ALL_ADDRESS_SIZES))
+
+TEST_ART_BROKEN_RUN_TESTS :=
+
# Note 116-nodex2oat is not broken per-se it just doesn't (and isn't meant to) work with --prebuild.
TEST_ART_BROKEN_PREBUILD_RUN_TESTS := \
116-nodex2oat