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)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to