commit 9c4f35229df162e42a34aae94b3eb2e2436c4469
author Ying Wang <wangying@google.com> Thu Jul 23 02:06:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 23 02:06:19 2015 +0000
tree d675e654f1d1a9fe7a08c8b56ca065525577a446
parent 2329b7218e2ca65767020f135b524d1c22957791
parent 86ac443cd1df83bbef4a18046714e067a9d13247

am 86ac443c: Merge "We don\'t have CXX_BARE any more"

* commit '86ac443cd1df83bbef4a18046714e067a9d13247':
  We don't have CXX_BARE any more

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 052997a..d98d2f2 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -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());