Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1754)

Unified Diff: content/browser/tracing/background_tracing_manager_browsertest.cc

Issue 1603683003: Disable BackgroundTracingManagerBrowserTest.CallTriggersMoreThanOnceOnlyGatherOnce under TSan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/sanitizers/tsan_suppressions.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/background_tracing_manager_browsertest.cc
diff --git a/content/browser/tracing/background_tracing_manager_browsertest.cc b/content/browser/tracing/background_tracing_manager_browsertest.cc
index e0001b86dd91ae821a3ee03f1db8f6d63c053b43..e2d11775c7ce44be8db7980771c2a364a288ebbb 100644
--- a/content/browser/tracing/background_tracing_manager_browsertest.cc
+++ b/content/browser/tracing/background_tracing_manager_browsertest.cc
@@ -184,9 +184,18 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
}
}
+#if defined(THREAD_SANITIZER)
+// There's a race in ConvertableToTraceFormat that's hard to suppress,
+// see http://crbug.com/559117.
+#define MAYBE_CallTriggersMoreThanOnceOnlyGatherOnce \
+ DISABLED_CallTriggersMoreThanOnceOnlyGatherOnce
+#else
+#define MAYBE_CallTriggersMoreThanOnceOnlyGatherOnce \
+ CallTriggersMoreThanOnceOnlyGatherOnce
+#endif
// This tests triggering more than once still only gathers once.
IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
- CallTriggersMoreThanOnceOnlyGatherOnce) {
+ MAYBE_CallTriggersMoreThanOnceOnlyGatherOnce) {
{
SetupBackgroundTracingManager();
« no previous file with comments | « build/sanitizers/tsan_suppressions.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698