Skip to content

A
angle
Commit feb470cc by Jamie Madill Committed by Commit Bot
Options

Test Runner: Prevent race by not resetting timeout.

This instead only sets the timeout when tests start to run. That way the timeout should always be at least the default timeout and we won't get into a situation where the watchdog times out the test immediately when the test starts. Bug: angleproject:5562 Change-Id: I6b12bb8fe8edcf35f46ba4fb106fdf80ff9402a1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2637182Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 2e3786ed
Showing with 1 addition and 2 deletions
src/tests/test_utils/runner/TestSuite.cpp
...@@ -427,8 +427,7 @@ class TestEventListener : public testing::EmptyTestEventListener ...@@ -427,8 +427,7 @@ class TestEventListener : public testing::EmptyTestEventListener
mTestResults->currentTestTimer.stop(); mTestResults->currentTestTimer.stop();
const testing::TestResult &resultIn = *testInfo.result(); const testing::TestResult &resultIn = *testInfo.result();
UpdateCurrentTestResult(resultIn, mTestResults); UpdateCurrentTestResult(resultIn, mTestResults);
mTestResults->currentTest = TestIdentifier(); mTestResults->currentTest = TestIdentifier();
mTestResults->currentTestTimeout = 0.0;
} }
void OnTestProgramEnd(const testing::UnitTest &testProgramInfo) override void OnTestProgramEnd(const testing::UnitTest &testProgramInfo) override
......
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