|
From: <sv...@va...> - 2011-03-17 07:45:54
|
Author: bart
Date: 2011-03-17 07:45:46 +0000 (Thu, 17 Mar 2011)
New Revision: 11647
Log:
Yet another attempt to make the timerfd-syscall test reliable.
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 2011-03-17 07:39:00 UTC (rev 11646)
+++ trunk/memcheck/tests/linux/timerfd-syscall.c 2011-03-17 07:45:46 UTC (rev 11647)
@@ -268,8 +268,8 @@
else
{
const double delta = (ttmr - tnow) * 1e-6;
- if (1.9 < delta && delta < 2.2)
- fprintf(stderr, "got timer ticks (%ld) after about 2s\n", ticks);
+ if (19 <= ticks && ticks <= 21 && 1.9 < delta && delta < 2.2)
+ fprintf(stderr, "got about 20 timer ticks after about 2s\n", ticks);
else
fprintf(stderr, "got timer ticks (%ld) after %.2f s\n", ticks, delta);
}
Modified: trunk/memcheck/tests/linux/timerfd-syscall.stderr.exp
===================================================================
--- trunk/memcheck/tests/linux/timerfd-syscall.stderr.exp 2011-03-17 07:39:00 UTC (rev 11646)
+++ trunk/memcheck/tests/linux/timerfd-syscall.stderr.exp 2011-03-17 07:45:46 UTC (rev 11647)
@@ -17,7 +17,7 @@
it_value = 0.1 it_interval = 0.1
sleeping 1 second ...
waiting timer ...
-got timer ticks (20) after about 2s
+got about 20 timer ticks 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 about 2s
+got about 20 timer ticks after about 2s
O_NONBLOCK test ...
waiting timer (flush the single tick) ...
got timer ticks (1) after 0.1 s
|