|
From: <sv...@va...> - 2010-09-19 17:21:41
|
Author: bart
Date: 2010-09-19 18:21:31 +0100 (Sun, 19 Sep 2010)
New Revision: 11368
Log:
Made timerfd-syscall test more robust by improving the time rounding algorithm.
Modified:
trunk/memcheck/tests/linux/timerfd-syscall.c
trunk/memcheck/tests/linux/timerfd-syscall.stderr.exp
Modified: trunk/memcheck/tests/linux/timerfd-syscall.c
===================================================================
--- trunk/memcheck/tests/linux/timerfd-syscall.c 2010-09-19 17:16:39 UTC (rev 11367)
+++ trunk/memcheck/tests/linux/timerfd-syscall.c 2010-09-19 17:21:31 UTC (rev 11368)
@@ -261,8 +261,13 @@
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");
Modified: trunk/memcheck/tests/linux/timerfd-syscall.stderr.exp
===================================================================
--- trunk/memcheck/tests/linux/timerfd-syscall.stderr.exp 2010-09-19 17:16:39 UTC (rev 11367)
+++ trunk/memcheck/tests/linux/timerfd-syscall.stderr.exp 2010-09-19 17:21:31 UTC (rev 11368)
@@ -17,7 +17,7 @@
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 @@
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
|