AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix ThreadTicks.ThreadNow test on windows

Browse Source 
The test is flaky because the OS does not sleep for the full requested
time. Adding a check for the OS sleep time.

Bug: v8:7492
Change-Id: I495ecc6595238bc1771adc434e766543513a0256
Reviewed-on: https://chromium-review.googlesource.com/937818
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Fadi Meawad <fmeawad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51774}
This commit is contained in:
Fadi Meawad 2018-03-05 13:29:56 -08:00 committed by Commit Bot
parent 8ca7bd39a5
commit 1ccbfb0019
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/unittests/base/platform/time-unittest.cc
View File

@ -386,15 +386,21 @@ TEST(TimeTicks, IsMonotonic) {
TEST(ThreadTicks, MAYBE_ThreadNow) { TEST(ThreadTicks, MAYBE_ThreadNow) {
if (ThreadTicks::IsSupported()) { if (ThreadTicks::IsSupported()) {
ThreadTicks::WaitUntilInitialized(); ThreadTicks::WaitUntilInitialized();
TimeTicks begin = TimeTicks::Now(); TimeTicks end, begin = TimeTicks::Now();
ThreadTicks begin_thread = ThreadTicks::Now(); ThreadTicks end_thread, begin_thread = ThreadTicks::Now();
TimeDelta delta;
// Make sure that ThreadNow value is non-zero. // Make sure that ThreadNow value is non-zero.
EXPECT_GT(begin_thread, ThreadTicks()); EXPECT_GT(begin_thread, ThreadTicks());
int iterations_count = 0;
do {
// Sleep for 10 milliseconds to get the thread de-scheduled. // Sleep for 10 milliseconds to get the thread de-scheduled.
OS::Sleep(base::TimeDelta::FromMilliseconds(10)); OS::Sleep(base::TimeDelta::FromMilliseconds(10));
ThreadTicks end_thread = ThreadTicks::Now(); end_thread = ThreadTicks::Now();
TimeTicks end = TimeTicks::Now(); end = TimeTicks::Now();
TimeDelta delta = end - begin; delta = end - begin;
EXPECT_LE(++iterations_count, 2); // fail after 2 attempts.
} while (delta.InMicroseconds() <
10000); // Make sure that the OS did sleep for at least 10 ms.
TimeDelta delta_thread = end_thread - begin_thread; TimeDelta delta_thread = end_thread - begin_thread;
// Make sure that some thread time have elapsed. // Make sure that some thread time have elapsed.
EXPECT_GT(delta_thread.InMicroseconds(), 0); EXPECT_GT(delta_thread.InMicroseconds(), 0);

5
test/unittests/unittests.status
View File

@ -3,8 +3,5 @@
# found in the LICENSE file. # found in the LICENSE file.
[ [
['system == windows', {
# BUG(7492).
'ThreadTicks.ThreadNow': [SKIP],
}], # 'system == windows'
] ]