From 8b233fc3c50e3c1785b445582502ecb9a7e983eb Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Wed, 6 Apr 2016 18:23:01 +0100 Subject: Remove more Quick-related macros in tests. Remove these macros, as Quick is gone: - TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING_WITH_QUICK - TEST_DISABLED_FOR_READ_BARRIER_WITH_QUICK Also remove TEST_DISABLED_FOR_NON_PIC_COMPILING_WITH_OPTIMIZING, as it is no longer used anywhere. Change-Id: I78617fc060b7727f9b6fffcb2348d6fca01b4928 --- compiler/common_compiler_test.h | 21 --------------------- compiler/driver/compiler_driver_test.cc | 6 ------ 2 files changed, 27 deletions(-) (limited to 'compiler') diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index 7c2c844e6f..2d139eb841 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -115,13 +115,6 @@ class CommonCompilerTest : public CommonRuntimeTest { std::list> header_code_and_maps_chunks_; }; -// TODO: When heap reference poisoning works with all compilers in use, get rid of this. -#define TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING_WITH_QUICK() \ - if (kPoisonHeapReferences && GetCompilerKind() == Compiler::kQuick) { \ - printf("WARNING: TEST DISABLED FOR HEAP REFERENCE POISONING WITH QUICK\n"); \ - return; \ - } - // TODO: When read barrier works with all tests, get rid of this. #define TEST_DISABLED_FOR_READ_BARRIER() \ if (kUseReadBarrier) { \ @@ -129,13 +122,6 @@ class CommonCompilerTest : public CommonRuntimeTest { return; \ } -// TODO: When read barrier works with all compilers in use, get rid of this. -#define TEST_DISABLED_FOR_READ_BARRIER_WITH_QUICK() \ - if (kUseReadBarrier && GetCompilerKind() == Compiler::kQuick) { \ - printf("WARNING: TEST DISABLED FOR READ BARRIER WITH QUICK\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) { \ @@ -155,13 +141,6 @@ class CommonCompilerTest : public CommonRuntimeTest { } \ } -// TODO: When non-PIC works with all compilers in use, get rid of this. -#define TEST_DISABLED_FOR_NON_PIC_COMPILING_WITH_OPTIMIZING() \ - if (GetCompilerKind() == Compiler::kOptimizing) { \ - printf("WARNING: TEST DISABLED FOR NON-PIC COMPILING WITH OPTIMIZING\n"); \ - return; \ - } - } // namespace art #endif // ART_COMPILER_COMMON_COMPILER_TEST_H_ diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 053f1f4bf5..b9a5a781da 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -144,8 +144,6 @@ TEST_F(CompilerDriverTest, DISABLED_LARGE_CompileDexLibCore) { } TEST_F(CompilerDriverTest, AbstractMethodErrorStub) { - TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING_WITH_QUICK(); - TEST_DISABLED_FOR_READ_BARRIER_WITH_QUICK(); TEST_DISABLED_FOR_READ_BARRIER_WITH_OPTIMIZING_FOR_UNSUPPORTED_INSTRUCTION_SETS(); jobject class_loader; { @@ -189,8 +187,6 @@ class CompilerDriverMethodsTest : public CompilerDriverTest { }; TEST_F(CompilerDriverMethodsTest, Selection) { - TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING_WITH_QUICK(); - TEST_DISABLED_FOR_READ_BARRIER_WITH_QUICK(); TEST_DISABLED_FOR_READ_BARRIER_WITH_OPTIMIZING_FOR_UNSUPPORTED_INSTRUCTION_SETS(); Thread* self = Thread::Current(); jobject class_loader; @@ -295,8 +291,6 @@ class CompilerDriverProfileTest : public CompilerDriverTest { }; TEST_F(CompilerDriverProfileTest, ProfileGuidedCompilation) { - TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING_WITH_QUICK(); - TEST_DISABLED_FOR_READ_BARRIER_WITH_QUICK(); TEST_DISABLED_FOR_READ_BARRIER_WITH_OPTIMIZING_FOR_UNSUPPORTED_INSTRUCTION_SETS(); Thread* self = Thread::Current(); jobject class_loader; -- cgit v1.2.3-59-g8ed1b