From d2ac307e505f71a2d439c264cb7c5eab9bd07e13 Mon Sep 17 00:00:00 2001 From: Evgeny Astigeevich Date: Wed, 29 Jan 2020 11:51:40 +0000 Subject: Disable Dex2oatSwapUseTest.CheckSwapUsage for x86_64 Dex2oatSwapUseTest.CheckSwapUsage disabled for all targets was changed to be disabled only for x86. However the test frequently fails on x86_64 as well. This CL disables the test for x86_64. Test: test.py --host --gtest Test: dex2oat_test Test: run-gtests.sh Bug: 29259363 Change-Id: I88a8bf735d2702c914ba952bdcc2431a85dbf761 --- runtime/common_runtime_test.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'runtime/common_runtime_test.h') diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 61c88474fa..c87d317a81 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -257,6 +257,12 @@ class CheckJniAbortCatcher { return; \ } +#define TEST_DISABLED_FOR_X86_64() \ + if (kRuntimeISA == InstructionSet::kX86_64) { \ + printf("WARNING: TEST DISABLED FOR X86_64\n"); \ + return; \ + } + #define TEST_DISABLED_FOR_STRING_COMPRESSION() \ if (mirror::kUseStringCompression) { \ printf("WARNING: TEST DISABLED FOR STRING COMPRESSION\n"); \ -- cgit v1.2.3-59-g8ed1b