diff options
| -rw-r--r-- | dex2oat/dex2oat_test.cc | 5 | ||||
| -rw-r--r-- | runtime/common_runtime_test.h | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc index 90b49556b7..e208337652 100644 --- a/dex2oat/dex2oat_test.cc +++ b/dex2oat/dex2oat_test.cc @@ -399,11 +399,6 @@ class Dex2oatSwapUseTest : public Dex2oatSwapTest { }; 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(); - RunTest(false /* use_fd */, false /* expect_use */); GrabResult1(); diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 17e3729a20..26ec364285 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -223,12 +223,6 @@ class CheckJniAbortCatcher { return; \ } -#define TEST_DISABLED_FOR_READ_BARRIER_ON_X86() \ - if (kUseReadBarrier && kRuntimeISA == kX86) { \ - printf("WARNING: TEST DISABLED FOR READ BARRIER ON X86\n"); \ - return; \ - } - #define TEST_DISABLED_FOR_STRING_COMPRESSION() \ if (mirror::kUseStringCompression) { \ printf("WARNING: TEST DISABLED FOR STRING COMPRESSION\n"); \ |