commit f94b491c2b9f8f01038af73863b6ba3945f70d0b
author Nick Kralevich <nnk@google.com> Mon Aug 24 07:10:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 24 07:10:16 2015 +0000
tree b9c88bf626f5b2a7f8fad5ca30926ec8eef611b0
parent abd1975dcc814087afb1fe262b5f2ce389fb4ff9
parent 4d7d05bd60b1d0bc20c95dd764fc2d916a12bb74

am 4d7d05bd: Merge "Revert "fix incompatibility with -fstack-protector-strong""

* commit '4d7d05bd60b1d0bc20c95dd764fc2d916a12bb74':
  Revert "fix incompatibility with -fstack-protector-strong"

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 052997a..c685e94 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -296,8 +296,8 @@
   Counter counter(Counter::CountAndDisarmNotifyFunction);
   ASSERT_EQ(0, counter.Value());
 
-  counter.SetTime(0, 1, 1, 0);
-  usleep(500000);
+  counter.SetTime(0, 500000000, 1, 0);
+  sleep(1);
 
   // The count should just be 1 because we disarmed the timer the first time it fired.
   ASSERT_EQ(1, counter.Value());
@@ -381,8 +381,8 @@
   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());