From owner-svn-src-all@freebsd.org Tue Mar 3 17:35:18 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 C32DC256AC0; Tue, 3 Mar 2020 17:35:18 +0000 (UTC) (envelope-from olivier@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) server-signature RSA-PSS (4096 bits) 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 48X40P0P2Mz4KVN; Tue, 3 Mar 2020 17:35:16 +0000 (UTC) (envelope-from olivier@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 4583F8CA3; Tue, 3 Mar 2020 17:35:16 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 023HZF2E025264; Tue, 3 Mar 2020 17:35:15 GMT (envelope-from olivier@FreeBSD.org) Received: (from olivier@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 023HZFcW025263; Tue, 3 Mar 2020 17:35:15 GMT (envelope-from olivier@FreeBSD.org) Message-Id: <202003031735.023HZFcW025263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivier set sender to olivier@FreeBSD.org using -f From: Olivier Cochard Date: Tue, 3 Mar 2020 17:35:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358589 - head/tests/sys/net X-SVN-Group: head X-SVN-Commit-Author: olivier X-SVN-Commit-Paths: head/tests/sys/net X-SVN-Commit-Revision: 358589 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.29 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: Tue, 03 Mar 2020 17:35:18 -0000 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 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 #include +#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)