Commit 19539201 authored by Maggie Chen's avatar Maggie Chen Committed by Commit Bot

Revert "Disable GpuInitializationAndRunningTasks on TSan"

This reverts commit 007cb99b.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Disable GpuInitializationAndRunningTasks on TSan
> 
> 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}

TBR=zmo@chromium.org,shimazu@chromium.org

Change-Id: Ie4472f6d98e0fe98ce95af1c7be7e95ef568b436
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1030130
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948516Reviewed-by: default avatarMaggie Chen <magchen@chromium.org>
Commit-Queue: Maggie Chen <magchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720987}
parent 43b4d5eb
......@@ -159,15 +159,7 @@ TEST_F(GpuWatchdogTest, GpuInitializationHang) {
}
// Normal GPU Initialization and Running Task
//
// 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) {
TEST_F(GpuWatchdogTest, GpuInitializationAndRunningTasks) {
// Assume GPU initialization takes 300 milliseconds.
SimpleTask(base::TimeDelta::FromMilliseconds(300));
watchdog_thread_->OnInitComplete();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment