summaryrefslogtreecommitdiff
path: root/runtime/common_runtime_test.h
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2016-07-28 16:54:49 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-07-28 16:54:49 +0000
commit5fc9ddef31d9a458a8ffdca35d73802e571a42a2 (patch)
treea389b04b78f8a6c20f3947314a5648e4f0335cb1 /runtime/common_runtime_test.h
parentd22b69a12777014a92a3551eba65a4c69f2800b2 (diff)
parent63b6eb400c9d9052447b213471f90dfa4e6f242c (diff)
Merge "Disable CheckSwapUsage test with read barriers on x86."
Diffstat (limited to 'runtime/common_runtime_test.h')
-rw-r--r--runtime/common_runtime_test.h6
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 {