From owner-svn-src-all@freebsd.org Wed May 27 16:33:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D566633766B; Wed, 27 May 2020 16:33:01 +0000 (UTC) (envelope-from syrinx@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49XGbK5KS8z4gD9; Wed, 27 May 2020 16:33:01 +0000 (UTC) (envelope-from syrinx@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B1EE8178CE; Wed, 27 May 2020 16:33:01 +0000 (UTC) (envelope-from syrinx@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04RGX1O9092315; Wed, 27 May 2020 16:33:01 GMT (envelope-from syrinx@FreeBSD.org) Received: (from syrinx@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04RGX1Jk092312; Wed, 27 May 2020 16:33:01 GMT (envelope-from syrinx@FreeBSD.org) Message-Id: <202005271633.04RGX1Jk092312@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: syrinx set sender to syrinx@FreeBSD.org using -f From: Shteryana Shopova Date: Wed, 27 May 2020 16:33:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361553 - in head/tests/sys: netinet netinet6 X-SVN-Group: head X-SVN-Commit-Author: syrinx X-SVN-Commit-Paths: in head/tests/sys: netinet netinet6 X-SVN-Commit-Revision: 361553 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2020 16:33:01 -0000 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