diff options
| author | 2016-07-28 16:37:28 +0100 | |
|---|---|---|
| committer | 2016-07-28 16:37:28 +0100 | |
| commit | 63b6eb400c9d9052447b213471f90dfa4e6f242c (patch) | |
| tree | e9ede70e0725c85da30c4e87cf00ebe0a0567254 /runtime/common_runtime_test.h | |
| parent | 93afc5f20a23ece78d6d6e506ed75775b8ef2113 (diff) | |
Disable CheckSwapUsage test with read barriers on x86.
This test does not produce the expected results on
some x86 systems when read barriers are enabled.
Also remove unused TEST_DISABLED_FOR_READ_BARRIER macro
definition.
Test: m test-art-host-gtest
Bug: 29259363
Bug: 12687968
Change-Id: If7c124226b32c10425725e62bb684150aba108ab
Diffstat (limited to 'runtime/common_runtime_test.h')
| -rw-r--r-- | runtime/common_runtime_test.h | 6 |
1 files changed, 6 insertions, 0 deletions
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 { |