From 4a32a7d8be2b269cddb60d0346b4eb07e4b9bae0 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 17 Mar 2011 07:45:46 +0000 Subject: [PATCH] Yet another attempt to make the timerfd-syscall test reliable. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11647 --- memcheck/tests/linux/timerfd-syscall.c | 4 ++-- memcheck/tests/linux/timerfd-syscall.stderr.exp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/memcheck/tests/linux/timerfd-syscall.c b/memcheck/tests/linux/timerfd-syscall.c index b11e34eb3e..2a2e1e2bcf 100644 --- a/memcheck/tests/linux/timerfd-syscall.c +++ b/memcheck/tests/linux/timerfd-syscall.c @@ -268,8 +268,8 @@ int main(int ac, char **av) 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); } diff --git a/memcheck/tests/linux/timerfd-syscall.stderr.exp b/memcheck/tests/linux/timerfd-syscall.stderr.exp index 247ce1f264..31ffa8468e 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 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 @@ timerfd_gettime returned: 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 -- 2.47.2