Date: Tue, 3 Mar 2020 17:35:15 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358589 - head/tests/sys/net Message-ID: <202003031735.023HZFcW025263@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier (ports committer) Date: Tue Mar 3 17:35:15 2020 New Revision: 358589 URL: https://svnweb.freebsd.org/changeset/base/358589 Log: Skip if_epair regression test if module doesn't exist Approved by: kp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D23876 Modified: head/tests/sys/net/Makefile head/tests/sys/net/if_epair.c Modified: head/tests/sys/net/Makefile ============================================================================== --- head/tests/sys/net/Makefile Tue Mar 3 17:30:13 2020 (r358588) +++ head/tests/sys/net/Makefile Tue Mar 3 17:35:15 2020 (r358589) @@ -22,6 +22,8 @@ TEST_METADATA+= is_exclusive=true MAN= PROGS+= randsleep +CFLAGS+= -I${.CURDIR:H:H} + WARNS?= 6 .include <bsd.test.mk> Modified: head/tests/sys/net/if_epair.c ============================================================================== --- head/tests/sys/net/if_epair.c Tue Mar 3 17:30:13 2020 (r358588) +++ head/tests/sys/net/if_epair.c Tue Mar 3 17:35:15 2020 (r358589) @@ -40,6 +40,7 @@ #include <strings.h> #include <atf-c.h> +#include "freebsd_test_suite/macros.h" ATF_TC(params); ATF_TC_HEAD(params, tc) @@ -52,9 +53,8 @@ ATF_TC_BODY(params, tc) struct ifreq ifr; int s; - s = kldload("if_epair"); - if (s == -1 && errno != EEXIST) - atf_tc_fail("Failed to load if_epair"); + kldload("if_epair"); + ATF_REQUIRE_KERNEL_MODULE("if_epair"); s = socket(AF_INET, SOCK_DGRAM, 0); if (s < 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003031735.023HZFcW025263>