Author: syrinx
Date: Wed May 27 16:33:00 2020
New Revision: 361553
URL: https://svnweb.freebsd.org/changeset/base/361553

Log:
  Proper check if divert(4) module is present by the relevant tests
  
  Fix the netinet/netinet6 divert tests falsely reporting 'ipdivert module is
  not loaded' when the divert module is built into the kernel
  
  Sponsored by: Axiado
  Differential Revision:        https://reviews.freebsd.org/D25026

Modified:
  head/tests/sys/netinet/divert.sh
  head/tests/sys/netinet6/divert.sh

Modified: head/tests/sys/netinet/divert.sh
==============================================================================
--- head/tests/sys/netinet/divert.sh    Wed May 27 15:06:03 2020        
(r361552)
+++ head/tests/sys/netinet/divert.sh    Wed May 27 16:33:00 2020        
(r361553)
@@ -31,7 +31,7 @@
 . $(atf_get_srcdir)/../common/vnet.subr
 
 load_divert_module() {
-       kldstat -q -n ipdivert
+       kldstat -q -m ipdivert
        if [ $? -ne  0 ]; then
                atf_skip "ipdivert module is not loaded"
        fi

Modified: head/tests/sys/netinet6/divert.sh
==============================================================================
--- head/tests/sys/netinet6/divert.sh   Wed May 27 15:06:03 2020        
(r361552)
+++ head/tests/sys/netinet6/divert.sh   Wed May 27 16:33:00 2020        
(r361553)
@@ -31,7 +31,7 @@
 . $(atf_get_srcdir)/../common/vnet.subr
 
 load_divert_module() {
-       kldstat -q -n ipdivert
+       kldstat -q -m ipdivert
        if [ $? -ne  0 ]; then
                atf_skip "ipdivert module is not loaded"
        fi
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to