OSDN Git Service

Revert "Modify test to avoid race condition."
authorChristopher Ferris <cferris@google.com>
Thu, 19 Feb 2015 21:35:16 +0000 (21:35 +0000)
committerChristopher Ferris <cferris@google.com>
Thu, 19 Feb 2015 21:35:47 +0000 (13:35 -0800)
This reverts commit 3da136aa47e2d1608b98abb2580f024b36f92831.

This change is not needed any where but lmp mr1.

Change-Id: I3f38e2e8e418959a487bc0c4148d3238743e4626

tests/time_test.cpp

index 5d335ea..691d8ff 100644 (file)
@@ -412,11 +412,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 = 1;
-  ts.it_value.tv_nsec = 0;
+  ts.it_value.tv_sec = 0;
+  ts.it_value.tv_nsec = 100;
   ts.it_interval.tv_sec = 0;
   ts.it_interval.tv_nsec = 0;
-  ASSERT_EQ(0, timer_settime(tdd.timer_id, 0, &ts, NULL));
+  ASSERT_EQ(0, timer_settime(tdd.timer_id, TIMER_ABSTIME, &ts, NULL));
 
   time_t cur_time = time(NULL);
   while (!tdd.complete && (time(NULL) - cur_time) < 5);