diff options
| author | Yabin Cui <yabinc@google.com> | 2015-05-20 13:36:56 -0700 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2015-05-20 13:36:56 -0700 |
| commit | fd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82 (patch) | |
| tree | d183804463ff81ad063189ab61112eb17475b148 /tests | |
| parent | bb4961cd4f0348b5e88bdf81dded7b63d1aadb0b (diff) | |
| parent | 473d96c0a8bb890ac84f4a69a5c8c54134fd30ef (diff) | |
| download | android_bionic-fd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82.tar.gz android_bionic-fd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82.tar.bz2 android_bionic-fd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82.zip | |
resolved conflicts for merge of 473d96c0 to lmp-mr1-ub-dev
Change-Id: I48269218b152054d527d9257d40490b54205140f
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 a0b0209ab..c37df366a 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); |