From c9aefabe2c46ad922378059413c73f8e8b3563b2 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Fri, 24 Oct 2014 16:07:31 +0000 Subject: [PATCH] Correct my previous commit: - getrusage_utime_back succeeds reliably on FreeBSD - getrusage_utime_zero passes/fails in a seemingly non-deterministic manner. Skip it for now (and fix it later) In the initial port of this testcase to FreeBSD, the results failed reliably in the same manner as it does on NetBSD Sponsored by: EMC / Isilon Storage Division --- contrib/netbsd-tests/lib/libc/sys/t_getrusage.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c b/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c index 4d8b0103c36..669c7042ff0 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c @@ -133,7 +133,9 @@ ATF_TC_BODY(getrusage_utime_back, tc) /* * Test that two consecutive calls are sane. */ +#ifdef __NetBSD__ atf_tc_expect_fail("PR kern/30115"); +#endif for (i = 0; i < maxiter; i++) { @@ -152,7 +154,9 @@ ATF_TC_BODY(getrusage_utime_back, tc) atf_tc_fail("user time went backwards"); } +#ifdef __NetBSD__ atf_tc_fail("anticipated error did not occur"); +#endif } ATF_TC(getrusage_utime_zero); @@ -166,15 +170,18 @@ ATF_TC_BODY(getrusage_utime_zero, tc) struct rusage ru; size_t i; +#ifdef __FreeBSD__ + atf_tc_skip("this testcase passes/fails sporadically on FreeBSD/i386 " + "@ r273153 (at least)"); +#endif + /* * Test that getrusage(2) does not return * zero user time for the calling process. * * See also (duplicate) PR port-amd64/41734. */ -#if defined(__NetBSD__) atf_tc_expect_fail("PR kern/30115"); -#endif for (i = 0; i < maxiter; i++) { @@ -188,9 +195,7 @@ ATF_TC_BODY(getrusage_utime_zero, tc) atf_tc_fail("zero user time from getrusage(2)"); } -#if defined(__NetBSD__) atf_tc_fail("anticipated error did not occur"); -#endif } ATF_TP_ADD_TCS(tp)