Skip to content

Commit

Permalink
Disable ActivityAnalyzerTest.GlobalAnalyzerConstruction under tsan
Browse files Browse the repository at this point in the history
This test is flaky under tsan.

Tbr: bcwhite@chromium.org
Bug: 1061320
Change-Id: I2a0e47659ca84aadb8a4e139406f7e77ec4a0349
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2487844
Reviewed-by: Kevin McNee <mcnee@chromium.org>
Commit-Queue: Kevin McNee <mcnee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819063}
  • Loading branch information
kjmcnee authored and Commit Bot committed Oct 20, 2020
1 parent e4603aa commit d5126f6
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion base/debug/activity_analyzer_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,13 @@ class SimpleActivityThread : public SimpleThread {

} // namespace

TEST_F(ActivityAnalyzerTest, GlobalAnalyzerConstruction) {
// TODO(1061320): Flaky under tsan.
#if defined(THREAD_SANITIZER)
#define MAYBE_GlobalAnalyzerConstruction DISABLED_GlobalAnalyzerConstruction
#else
#define MAYBE_GlobalAnalyzerConstruction GlobalAnalyzerConstruction
#endif
TEST_F(ActivityAnalyzerTest, MAYBE_GlobalAnalyzerConstruction) {
GlobalActivityTracker::CreateWithLocalMemory(kMemorySize, 0, "", 3, 0);
GlobalActivityTracker::Get()->process_data().SetString("foo", "bar");

Expand Down

0 comments on commit d5126f6

Please sign in to comment.