summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2015-06-18 16:19:02 -0700
committerYabin Cui <yabinc@google.com>2015-06-18 16:19:02 -0700
commit410c1adf5fececb0149b7b65fde3130327ff24c8 (patch)
tree48ef2ad6b954690fca31d8f01d11b43be55eaf85
parentea248d9ca80d4ef731d821648711094aa03b0318 (diff)
downloadbionic-410c1adf5fececb0149b7b65fde3130327ff24c8.zip
bionic-410c1adf5fececb0149b7b65fde3130327ff24c8.tar.gz
bionic-410c1adf5fececb0149b7b65fde3130327ff24c8.tar.bz2
Fix flaky test of timer_create_multiple in L.
Bug: 20677618 Change-Id: I0cb5faf77edce042b10611543180f3e2e73d3d05
-rw-r--r--tests/time_test.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 97e371c..42c20d3 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -140,7 +140,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) {
@@ -356,8 +356,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());