diff options
| author | Yabin Cui <yabinc@google.com> | 2015-05-20 21:48:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-20 21:48:09 +0000 |
| commit | c15a935202319a41ee0be94afcdbde1d07568ec8 (patch) | |
| tree | 9d3b172d2bd44cb2db23ffee54a6937b73697033 /tests | |
| parent | 7490c5c5944391e99bc6c3564bce03d3cd4a39e0 (diff) | |
| parent | fd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82 (diff) | |
| download | bionic-c15a935202319a41ee0be94afcdbde1d07568ec8.zip bionic-c15a935202319a41ee0be94afcdbde1d07568ec8.tar.gz bionic-c15a935202319a41ee0be94afcdbde1d07568ec8.tar.bz2 | |
am fd20a8c2: resolved conflicts for merge of 473d96c0 to lmp-mr1-ub-dev
* commit 'fd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82':
Fix timer flaky test in lollipop-mr1-cts-dev.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/time_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/time_test.cpp b/tests/time_test.cpp index a0b0209..c37df36 100644 --- a/tests/time_test.cpp +++ b/tests/time_test.cpp @@ -456,11 +456,11 @@ TEST(time, timer_delete_from_timer_thread) { ASSERT_EQ(0, timer_create(CLOCK_REALTIME, &se, &tdd.timer_id)); itimerspec ts; - ts.it_value.tv_sec = 0; - ts.it_value.tv_nsec = 100; + ts.it_value.tv_sec = 1; + ts.it_value.tv_nsec = 0; ts.it_interval.tv_sec = 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); while (!tdd.complete && (time(NULL) - cur_time) < 5); |