generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am fd20a8c2: resolved conflicts for merge of 473d96c0 to lmp-mr1-ub-dev

Browse Source 
* commit 'fd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82':
  Fix timer flaky test in lollipop-mr1-cts-dev.
This commit is contained in:
Yabin Cui
2015-05-20 21:48:09 +00:00
committed by Android Git Automerger
parent 7490c5c594 fd20a8c2d6
commit c15a935202
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/time_test.cpp
View File

@@ -456,11 +456,11 @@ TEST(time, timer_delete_from_timer_thread) {
ASSERT_EQ(0, timer_create(CLOCK_REALTIME, &se, &tdd.timer_id)); ASSERT_EQ(0, timer_create(CLOCK_REALTIME, &se, &tdd.timer_id));
itimerspec ts; itimerspec ts;
ts.it_value.tv_sec = 0; ts.it_value.tv_sec = 1;
ts.it_value.tv_nsec = 100; ts.it_value.tv_nsec = 0;
ts.it_interval.tv_sec = 0; ts.it_interval.tv_sec = 0;
ts.it_interval.tv_nsec = 0; ts.it_interval.tv_nsec = 0;
ASSERT_EQ(0, timer_settime(tdd.timer_id, TIMER_ABSTIME, &ts, NULL)); ASSERT_EQ(0, timer_settime(tdd.timer_id, 0, &ts, NULL));
time_t cur_time = time(NULL); time_t cur_time = time(NULL);
while (!tdd.complete && (time(NULL) - cur_time) < 5); while (!tdd.complete && (time(NULL) - cur_time) < 5);