Skip to content

Commit

Permalink
Disable GpuInitializationAndRunningTasks on TSan
Browse files Browse the repository at this point in the history
It was flaky on TSan bot.

TBR=zmo@chromium.org

No-Try: true
Bug: 1030130
Change-Id: I3dbbe2f8e3559609bc1bac8e6504417c2a2c1b11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1947866
Reviewed-by: Makoto Shimazu <shimazu@chromium.org>
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720815}
  • Loading branch information
makotoshimazu authored and Commit Bot committed Dec 3, 2019
1 parent 0bf0252 commit 007cb99
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion gpu/ipc/service/gpu_watchdog_thread_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,15 @@ TEST_F(GpuWatchdogTest, GpuInitializationHang) {
}

// Normal GPU Initialization and Running Task
TEST_F(GpuWatchdogTest, GpuInitializationAndRunningTasks) {
//
// Disabled on TSan due to flakiness: https://crbug.com/1030130.
#if defined(THREAD_SANITIZER)
#define MAYBE_GpuInitializationAndRunningTasks \
DISABLED_GpuInitializationAndRunningTasks
#else
#define MAYBE_GpuInitializationAndRunningTasks GpuInitializationAndRunningTasks
#endif
TEST_F(GpuWatchdogTest, MAYBE_GpuInitializationAndRunningTasks) {
// Assume GPU initialization takes 300 milliseconds.
SimpleTask(base::TimeDelta::FromMilliseconds(300));
watchdog_thread_->OnInitComplete();
Expand Down

0 comments on commit 007cb99

Please sign in to comment.