Merge "Disable run-tests causing occasional timeouts with CC."
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 36dd9f4..4500863 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -526,15 +526,18 @@
TEST_ART_BROKEN_OPTIMIZING_DEBUGGABLE_RUN_TESTS :=
-# Tests that should fail in the read barrier configuration with the default (Quick) compiler.
+# Tests that should fail in the read barrier configuration with the default (Quick) compiler (AOT).
+# 004: Occasional timeout: "TEST TIMED OUT!" (b/26786154).
# 137: Quick has no support for read barriers and punts to the
# interpreter, but CFI unwinding expects managed frames.
# 554: Quick does not support JIT profiling.
TEST_ART_BROKEN_DEFAULT_READ_BARRIER_RUN_TESTS := \
+ 004-ThreadStress \
137-cfi \
554-jit-profile-file
-# Tests that should fail in the read barrier configuration with the Optimizing compiler.
+# Tests that should fail in the read barrier configuration with the Optimizing compiler (AOT).
+# 004: Occasional timeout: "TEST TIMED OUT!" (b/26786154).
# 484: Baker's fast path based read barrier compiler instrumentation generates code containing
# more parallel moves on x86, thus some Checker assertions may fail.
# 527: On ARM64, the read barrier instrumentation does not support the HArm64IntermediateAddress
@@ -542,14 +545,19 @@
# 537: Expects an array copy to be intrinsified on x86-64, but calling-on-slowpath intrinsics are
# not yet handled in the read barrier configuration.
TEST_ART_BROKEN_OPTIMIZING_READ_BARRIER_RUN_TESTS := \
+ 004-ThreadStress \
484-checker-register-hints \
527-checker-array-access-split \
537-checker-arraycopy
# Tests that should fail in the read barrier configuration with JIT.
+# 004: Occasional timeout: "TEST TIMED OUT!" (b/26786154).
# 141: Disabled because of intermittent failures on the ART Builtbot (b/25866001).
+# 496: Occasional timeout: "Fault message: timeout: the monitored command dumped core" (b/26786304).
TEST_ART_BROKEN_JIT_READ_BARRIER_RUN_TESTS := \
- 141-class-unload
+ 004-ThreadStress \
+ 141-class-unload \
+ 496-checker-inlining-and-class-loader
ifeq ($(ART_USE_READ_BARRIER),true)
ifneq (,$(filter default,$(COMPILER_TYPES)))
