Index: content/test/ppapi/ppapi_browsertest.cc |
diff --git a/content/test/ppapi/ppapi_browsertest.cc b/content/test/ppapi/ppapi_browsertest.cc |
index f73632a2cd0702bdbf34e36f00db2582f0f6dd7d..1a43355fac1d7e23a356a90d6b1939eafdc041b7 100644 |
--- a/content/test/ppapi/ppapi_browsertest.cc |
+++ b/content/test/ppapi/ppapi_browsertest.cc |
@@ -17,13 +17,21 @@ namespace { |
// This macro finesses macro expansion to do what we want. |
#define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) |
+#if defined(THREAD_SANITIZER) |
+#define DISABLE_IF_TSAN(test_name) DISABLED_##test_name |
+#else |
+#define DISABLE_IF_TSAN(test_name) test_name |
+#endif |
+ |
#define TEST_PPAPI_IN_PROCESS(test_name) \ |
IN_PROC_BROWSER_TEST_F(PPAPITest, test_name) { \ |
RunTest(STRIP_PREFIXES(test_name)); \ |
} |
+// OutOfProcessPPAPITest tests time out under ThreadSanitizer, |
+// see https://crbug.com/448323. |
#define TEST_PPAPI_OUT_OF_PROCESS(test_name) \ |
- IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ |
+ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, DISABLE_IF_TSAN(test_name)) { \ |
RunTest(STRIP_PREFIXES(test_name)); \ |
} |
@@ -80,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(PPAPITest, |
RunTest("Instance_ExecuteScriptAtInstanceShutdown"); |
} |
IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, |
- Instance_ExecuteScriptAtInstanceShutdown) { |
+ DISABLE_IF_TSAN(Instance_ExecuteScriptAtInstanceShutdown)) { |
raymes
2015/01/14 23:40:24
nit: can you link the bug here too?
|
// (See the comment for the in-process version of this test above) |
RunTest("Instance_SetupExecuteScriptAtInstanceShutdown"); |
RunTest("Instance_ExecuteScriptAtInstanceShutdown"); |