Commit 556d812a by Jamie Madill Committed by Commit Bot

Test Runner: Disable watchdog when debugger attached.

Bug: angleproject:3162 Change-Id: I3685a4fe068b6e82b8bb04448c212788f563ab8b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2483463 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 6883db53
...@@ -1267,7 +1267,11 @@ int TestSuite::run() ...@@ -1267,7 +1267,11 @@ int TestSuite::run()
// Run tests serially. // Run tests serially.
if (!mBotMode) if (!mBotMode)
{ {
startWatchdog(); if (!angle::IsDebuggerAttached())
{
startWatchdog();
}
int retVal = RUN_ALL_TESTS(); int retVal = RUN_ALL_TESTS();
{ {
...@@ -1275,7 +1279,10 @@ int TestSuite::run() ...@@ -1275,7 +1279,10 @@ int TestSuite::run()
mTestResults.allDone = true; mTestResults.allDone = true;
} }
mWatchdogThread.join(); if (mWatchdogThread.joinable())
{
mWatchdogThread.join();
}
return retVal; return retVal;
} }
......
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