Disable dex2oat test TestWatchdogTrigger with Valgrind.
This test sometimes fails an assertion with Valgrind:
art/dex2oat/dex2oat_test.cc:137: Failure
Value of: odex_file.get() == nullptr
Actual: false
Expected: true
Disable it while we investigate.
Test: art/test/testrunner/run_build_test_target.py -j8 art-gtest-valgrind64
Bug: 63052624
Change-Id: I75fdbad6f78377b3f80cd2447fb20fc5792cbdcf
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index 6a9d979..10efaf3 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -950,6 +950,7 @@
}
TEST_F(Dex2oatWatchdogTest, TestWatchdogTrigger) {
+ TEST_DISABLED_FOR_MEMORY_TOOL_VALGRIND(); // b/63052624
// Check with ten milliseconds.
RunTest(false, { "--watchdog-timeout=10" });
}
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index 74bc0b2..e2131f1 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -288,6 +288,12 @@
return; \
}
+#define TEST_DISABLED_FOR_MEMORY_TOOL_VALGRIND() \
+ if (RUNNING_ON_MEMORY_TOOL > 0 && kMemoryToolIsValgrind) { \
+ printf("WARNING: TEST DISABLED FOR MEMORY TOOL VALGRIND\n"); \
+ return; \
+ }
+
#define TEST_DISABLED_FOR_MEMORY_TOOL_ASAN() \
if (RUNNING_ON_MEMORY_TOOL > 0 && !kMemoryToolIsValgrind) { \
printf("WARNING: TEST DISABLED FOR MEMORY TOOL ASAN\n"); \