commit dc813fe338626b28a8e9066c81fac6dac0982af5
author Christopher Ferris <cferris@google.com> Wed Sep 30 23:44:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 30 23:44:34 2015 +0000
tree d12e83847a3db65561481ad42c06a00cdfff749d
parent 8bb2141b7707b593245b77e3c73c26b7bb6f29fd
parent ad157a3c3353ba69d3bd155a7c09f9943a22f8d2

am ad157a3c: Merge "Add a no dwarf version of assembler macros."

* commit 'ad157a3c3353ba69d3bd155a7c09f9943a22f8d2':
  Add a no dwarf version of assembler macros.

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());