Disable test cases `AssemblerMIPS{32r6,64}Test.Toolchain` in ART gtest.
These test cases rely on `gcc` (used as reference assembler), which is
being removed from Android (b/147240075). This does not affect other
test cases in `assembler_mips32r6_test` and `assembler_mips64_test`,
as verification against the reference assembler had already been
disabled for speed reasons (b/73903608).
Test: m test-art-host-gtest-assembler_mips32r6_test
Test: m test-art-host-gtest-assembler_mips64_test
Bug: 147240075
Bug: 147336214
Bug: 147346243
Change-Id: I99edd834c5e3ca626b36b6cbfecfb551f01e8640
diff --git a/compiler/utils/mips/assembler_mips32r6_test.cc b/compiler/utils/mips/assembler_mips32r6_test.cc
index 4e27bbf..a465a68 100644
--- a/compiler/utils/mips/assembler_mips32r6_test.cc
+++ b/compiler/utils/mips/assembler_mips32r6_test.cc
@@ -425,6 +425,10 @@
TEST_F(AssemblerMIPS32r6Test, Toolchain) {
+ // This test is disabled as `gcc` (used as MIPS32 assembler, see
+ // `AssemblerMIPS32r6Test.GetAssemblerCmdName`) is being removed from Android
+ // (see b/147336214 and b/147240075).
+ TEST_DISABLED();
EXPECT_TRUE(CheckTools());
}
diff --git a/compiler/utils/mips64/assembler_mips64_test.cc b/compiler/utils/mips64/assembler_mips64_test.cc
index 499e8f4..2f7b223 100644
--- a/compiler/utils/mips64/assembler_mips64_test.cc
+++ b/compiler/utils/mips64/assembler_mips64_test.cc
@@ -415,6 +415,10 @@
};
TEST_F(AssemblerMIPS64Test, Toolchain) {
+ // This test is disabled as `gcc` (used as MIPS64 assembler, see
+ // `AssemblerMIPS64Test.GetAssemblerCmdName`) is being removed from Android
+ // (see b/147336214 and b/147240075).
+ TEST_DISABLED();
EXPECT_TRUE(CheckTools());
}
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index e1ab3df..61c8847 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -221,6 +221,12 @@
DISALLOW_COPY_AND_ASSIGN(CheckJniAbortCatcher);
};
+#define TEST_DISABLED() \
+ do { \
+ printf("WARNING: TEST DISABLED\n"); \
+ return; \
+ } while (false)
+
#define TEST_DISABLED_FOR_ARM() \
if (kRuntimeISA == InstructionSet::kArm || kRuntimeISA == InstructionSet::kThumb2) { \
printf("WARNING: TEST DISABLED FOR ARM\n"); \