From bdeb9b7030d30a94bddbb84f4a8bf2f92da9fddd Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 7 Jan 2015 17:42:07 -0800 Subject: [PATCH] Re-enable ParallelGC test for gcstress mode Ran the test hundreds of times with gcstress without any failures. Bug: 16406852 Change-Id: Idd2d248bd43bfb20ad7313e12ce3dce85bea3de5 --- build/Android.common_test.mk | 8 +------- test/Android.run-test.mk | 3 +-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk index 8e3807855..da50d53db 100644 --- a/build/Android.common_test.mk +++ b/build/Android.common_test.mk @@ -25,13 +25,7 @@ ART_TARGET_CFLAGS += -DART_TARGET_NATIVETEST_DIR=${ART_TARGET_NATIVETEST_DIR} # List of known broken tests that we won't attempt to execute. The test name must be the full # rule name such as test-art-host-oat-optimizing-HelloWorld64. -ART_TEST_KNOWN_BROKEN := \ - test-art-host-run-test-gcstress-default-prebuild-114-ParallelGC32 \ - test-art-host-run-test-gcstress-interpreter-prebuild-114-ParallelGC32 \ - test-art-host-run-test-gcstress-optimizing-prebuild-114-ParallelGC32 \ - test-art-host-run-test-gcstress-default-prebuild-114-ParallelGC64 \ - test-art-host-run-test-gcstress-interpreter-prebuild-114-ParallelGC64 \ - test-art-host-run-test-gcstress-optimizing-prebuild-114-ParallelGC64 +ART_TEST_KNOWN_BROKEN := # Failing valgrind tests. # Note: *all* 64b tests involving the runtime do not work currently. b/15170219. diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 2abf48eb8..fd66a02f3 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -214,8 +214,7 @@ endif TEST_ART_BROKEN_NO_RELOCATE_TESTS := # Tests that are broken with GC stress. -TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := \ - 114-ParallelGC +TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := ifneq (,$(filter gcstress,$(GC_TYPES))) ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \ -- 2.11.0