diff options
| -rw-r--r-- | compiler/common_compiler_test.h | 7 | ||||
| -rw-r--r-- | dex2oat/dex2oat_test.cc | 5 | ||||
| -rw-r--r-- | runtime/common_runtime_test.h | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index 2d139eb841..c9423757ab 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -115,13 +115,6 @@ class CommonCompilerTest : public CommonRuntimeTest { std::list<std::vector<uint8_t>> header_code_and_maps_chunks_; }; -// TODO: When read barrier works with all tests, get rid of this. -#define TEST_DISABLED_FOR_READ_BARRIER() \ - if (kUseReadBarrier) { \ - printf("WARNING: TEST DISABLED FOR READ BARRIER\n"); \ - return; \ - } - // TODO: When read barrier works with all Optimizing back ends, get rid of this. #define TEST_DISABLED_FOR_READ_BARRIER_WITH_OPTIMIZING_FOR_UNSUPPORTED_INSTRUCTION_SETS() \ if (kUseReadBarrier && GetCompilerKind() == Compiler::kOptimizing) { \ diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc index c076b5aea8..58dd047081 100644 --- a/dex2oat/dex2oat_test.cc +++ b/dex2oat/dex2oat_test.cc @@ -396,6 +396,11 @@ 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 b68eb19f2a..8f7d18b67a 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -205,6 +205,12 @@ 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; \ + } + } // namespace art namespace std { |