Disable the dex2oat swap test for x86 altogether.
On x86, this test has been seen failing on the CMS
configuration, not just the CC configuration.
Test: m ART_USE_READ_BARRIER=true test-art-host-gtest
Test: m ART_USE_READ_BARRIER=false test-art-host-gtest
Bug: 29259363
Change-Id: I3690aaec0aedd0020660aff42b408487e042cfd4
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index 5dcdd9e..6881f75 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -400,9 +400,9 @@
TEST_F(Dex2oatSwapUseTest, CheckSwapUsage) {
// The `native_alloc_2_ >= native_alloc_1_` assertion below may not
- // hold true on some x86 systems when read barriers are enabled;
- // disable this test while we investigate (b/29259363).
- TEST_DISABLED_FOR_READ_BARRIER_ON_X86();
+ // hold true on some x86 systems; disable this test while we
+ // investigate (b/29259363).
+ TEST_DISABLED_FOR_X86();
RunTest(false /* use_fd */,
false /* expect_use */);
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index 17e3729..d7abe2a 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -223,9 +223,9 @@
return; \
}
-#define TEST_DISABLED_FOR_READ_BARRIER_ON_X86() \
- if (kUseReadBarrier && kRuntimeISA == kX86) { \
- printf("WARNING: TEST DISABLED FOR READ BARRIER ON X86\n"); \
+#define TEST_DISABLED_FOR_X86() \
+ if (kRuntimeISA == kX86) { \
+ printf("WARNING: TEST DISABLED FOR X86\n"); \
return; \
}
