diff options
| author | glider <glider@chromium.org> | 2016-01-19 02:06:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-19 10:07:20 +0000 |
| commit | 431e0ba1472931de155e7540d9ef2385c2e553ca (patch) | |
| tree | 793e11b3307412539b672dedc0595b9d41e4d77c | |
| parent | 8b1cb343e6709541a68a2fe1083520cbc6e288a7 (diff) | |
| download | chromium_src-431e0ba1472931de155e7540d9ef2385c2e553ca.zip chromium_src-431e0ba1472931de155e7540d9ef2385c2e553ca.tar.gz chromium_src-431e0ba1472931de155e7540d9ef2385c2e553ca.tar.bz2 | |
Disable BackgroundTracingManagerBrowserTest.CallTriggersMoreThanOnceOnlyGatherOnce under TSan.
Turns out the suppression for allocation stack didn't work. Remove it and disable the test instead.
BUG=559117
TBR=reillyg@chromium.org,dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1603683003
Cr-Commit-Position: refs/heads/master@{#370090}
| -rw-r--r-- | build/sanitizers/tsan_suppressions.cc | 3 | ||||
| -rw-r--r-- | content/browser/tracing/background_tracing_manager_browsertest.cc | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/build/sanitizers/tsan_suppressions.cc b/build/sanitizers/tsan_suppressions.cc index c6b12ba..475885c 100644 --- a/build/sanitizers/tsan_suppressions.cc +++ b/build/sanitizers/tsan_suppressions.cc @@ -280,9 +280,6 @@ char kTSanDefaultSuppressions[] = // https://crbug.com/539315 "race:MojoCreateMessagePipe\n" -// http://crbug.com/559117 -"race:base::trace_event::TraceConfig::AsConvertableToTraceFormat\n" - // https://crbug.com/569682 "race:blink::ThreadState::visitStackRoots\n" diff --git a/content/browser/tracing/background_tracing_manager_browsertest.cc b/content/browser/tracing/background_tracing_manager_browsertest.cc index e0001b8..e2d1177 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(); |