am 6cc98af7: Merge "Don\'t use TIMER_ABSTIME in time_test."

* commit '6cc98af72b0c48c58b2ab5fdb5f7abb842175299':
  Don't use TIMER_ABSTIME in time_test.
This commit is contained in:
Yabin Cui 2015-06-19 18:25:21 +00:00 committed by Android Git Automerger
commit a4c422026a

View File

@ -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) {
@ -223,7 +223,7 @@ TEST(time, timer_create_SIGEV_SIGNAL) {
ts.it_value.tv_nsec = 1;
ts.it_interval.tv_sec = 0;
ts.it_interval.tv_nsec = 0;
ASSERT_EQ(0, timer_settime(timer_id, TIMER_ABSTIME, &ts, NULL));
ASSERT_EQ(0, timer_settime(timer_id, 0, &ts, NULL));
usleep(500000);
ASSERT_EQ(1, timer_create_SIGEV_SIGNAL_signal_handler_invocation_count);