From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 19 Sep 2010 17:21:31 +0000 (+0000)
Subject: Made timerfd-syscall test more robust by improving the time rounding algorithm.
X-Git-Tag: svn/VALGRIND_3_6_0~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75ac57dc3a30fea8c909a21dc21c5666666a557b;p=thirdparty%2Fvalgrind.git

Made timerfd-syscall test more robust by improving the time rounding algorithm.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11368
---

diff --git a/memcheck/tests/linux/timerfd-syscall.c b/memcheck/tests/linux/timerfd-syscall.c
index 8562e09a86..866eb582b3 100644
--- a/memcheck/tests/linux/timerfd-syscall.c
+++ b/memcheck/tests/linux/timerfd-syscall.c
@@ -261,8 +261,13 @@ int main(int ac, char **av)
     if (ticks <= 0)
       fprintf(stderr, "whooops! no timer showed up!\n");
     else
-      fprintf(stderr, "got timer ticks (%ld) after %.1f s\n",
-              ticks, (ttmr - tnow) * 1e-6);
+    {
+      const double delta = (ttmr - tnow) * 1e-6;
+      if (1.9 < delta && delta < 2.1)
+        fprintf(stderr, "got timer ticks (%ld) after about 2s\n", ticks);
+      else
+        fprintf(stderr, "got timer ticks (%ld) after %.1f s\n", ticks, delta);
+    }
 
 
     fprintf(stderr, "O_NONBLOCK test ...\n");
diff --git a/memcheck/tests/linux/timerfd-syscall.stderr.exp b/memcheck/tests/linux/timerfd-syscall.stderr.exp
index 3e1cb41ff4..247ce1f264 100644
--- a/memcheck/tests/linux/timerfd-syscall.stderr.exp
+++ b/memcheck/tests/linux/timerfd-syscall.stderr.exp
@@ -17,7 +17,7 @@ timerfd_gettime returned:
 	it_value = 0.1 it_interval = 0.1
 sleeping 1 second ...
 waiting timer ...
-got timer ticks (20) after 2.0 s
+got timer ticks (20) after about 2s
 O_NONBLOCK test ...
 waiting timer (flush the single tick) ...
 got timer ticks (1) after 0.1 s
@@ -40,7 +40,7 @@ timerfd_gettime returned:
 	it_value = 0.1 it_interval = 0.1
 sleeping 1 second ...
 waiting timer ...
-got timer ticks (20) after 2.0 s
+got timer ticks (20) after about 2s
 O_NONBLOCK test ...
 waiting timer (flush the single tick) ...
 got timer ticks (1) after 0.1 s