diff options
| author | Yabin Cui <yabinc@google.com> | 2015-06-19 19:06:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-19 19:06:22 +0000 |
| commit | cb0607590341ed2512a55015e66e19e7f7db3723 (patch) | |
| tree | eb652d6e7b40985d3b335c2e70bd17ccad5ec913 /tests | |
| parent | c08c88b5fcec05551858c32bc57f4ae614c0ce5c (diff) | |
| parent | 8beb0c34da46a5146a2de8256db8bb42febb283c (diff) | |
| download | bionic-cb0607590341ed2512a55015e66e19e7f7db3723.zip bionic-cb0607590341ed2512a55015e66e19e7f7db3723.tar.gz bionic-cb0607590341ed2512a55015e66e19e7f7db3723.tar.bz2 | |
am 8beb0c34: am b245bc75: am 0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
* commit '8beb0c34da46a5146a2de8256db8bb42febb283c':
Fix flaky test of timer_create_multiple in L.
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 c37df36..90de8d8 100644 --- a/tests/time_test.cpp +++ b/tests/time_test.cpp @@ -166,7 +166,7 @@ void SetTime(timer_t t, time_t value_s, time_t value_ns, time_t interval_s, time ts.it_value.tv_nsec = value_ns; ts.it_interval.tv_sec = interval_s; ts.it_interval.tv_nsec = interval_ns; - ASSERT_EQ(0, timer_settime(t, TIMER_ABSTIME, &ts, NULL)); + ASSERT_EQ(0, timer_settime(t, 0, &ts, NULL)); } static void NoOpNotifyFunction(sigval_t) { @@ -381,8 +381,8 @@ TEST(time, timer_create_multiple) { ASSERT_EQ(0, counter2.Value()); ASSERT_EQ(0, counter3.Value()); - counter2.SetTime(0, 1, 0, 0); - usleep(500000); + counter2.SetTime(0, 500000000, 0, 0); + sleep(1); EXPECT_EQ(0, counter1.Value()); EXPECT_EQ(1, counter2.Value()); |