From 7e1a212e48f7e9b03b78d5e2563f93f1533e7cc1 Mon Sep 17 00:00:00 2001 From: vangyzen Date: Thu, 1 Oct 2020 21:52:57 +0000 Subject: [PATCH] fix setitimer test for returned it_value An old it_value of {4,3} is valid. Allow it. Reviewed by: bdrewery MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D26445 --- contrib/netbsd-tests/lib/libc/sys/t_getitimer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c b/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c index 0e4e7b6be33..e4b22db05d0 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c @@ -195,8 +195,10 @@ ATF_TC_BODY(setitimer_old, tc) ATF_REQUIRE(setitimer(ITIMER_REAL, &it, &ot) == 0); #ifdef __FreeBSD__ - if (ot.it_value.tv_sec == 4 && ot.it_value.tv_usec == 3) - atf_tc_fail("setitimer(2) did not return remaining time"); + ATF_REQUIRE_MSG(ot.it_value.tv_sec < 4 || + ot.it_value.tv_sec == 4 && ot.it_value.tv_usec <= 3, + "setitimer(2) returned invalid it_value: %jd %jd", + (intmax_t)ot.it_value.tv_sec, (intmax_t)ot.it_value.tv_usec); #else if (ot.it_value.tv_sec != 4 || ot.it_value.tv_usec != 3) atf_tc_fail("setitimer(2) did not store old values"); -- 2.45.0