summaryrefslogtreecommitdiff
path: root/runtime/common_runtime_test.h
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2017-02-14 16:16:30 +0000
committer Vladimir Marko <vmarko@google.com> 2017-02-14 16:16:30 +0000
commit57070daa94f1eb98bea947494b98ac296eebeed6 (patch)
tree887b685650ee58c50f8b16bd383416dc408c4392 /runtime/common_runtime_test.h
parent38f5663a970b633f08e144b4dff33633c51352ee (diff)
Revert "Enable dex2oat swap test for CC on x86."
Is't still failing and the difference can be rather huge: Expected: (native_alloc_2_) < (native_alloc_1_), actual: 379712 vs 248600 Bug: 29259363 This reverts commit 38f5663a970b633f08e144b4dff33633c51352ee. Change-Id: Ie1d62fbba688aeadffb9d5aafd5b9cf632742ed6
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 26ec364285..17e3729a20 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -223,6 +223,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; \
+ }
+
#define TEST_DISABLED_FOR_STRING_COMPRESSION() \
if (mirror::kUseStringCompression) { \
printf("WARNING: TEST DISABLED FOR STRING COMPRESSION\n"); \