From owner-svn-src-all@freebsd.org Fri Oct 2 00:52:31 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 C160B3F0CBF; Fri, 2 Oct 2020 00:52:31 +0000 (UTC) (envelope-from mhorne@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 4C2Wg34mjDz3g4s; Fri, 2 Oct 2020 00:52:31 +0000 (UTC) (envelope-from mhorne@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 8713F19DCA; Fri, 2 Oct 2020 00:52:31 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0920qV41041662; Fri, 2 Oct 2020 00:52:31 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0920qVGP041661; Fri, 2 Oct 2020 00:52:31 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202010020052.0920qVGP041661@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Fri, 2 Oct 2020 00:52:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366351 - head/contrib/netbsd-tests/fs X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: head/contrib/netbsd-tests/fs X-SVN-Commit-Revision: 366351 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: Fri, 02 Oct 2020 00:52:31 -0000 Author: mhorne Date: Fri Oct 2 00:52:31 2020 New Revision: 366351 URL: https://svnweb.freebsd.org/changeset/base/366351 Log: tmpfs tests: check for built-in tmpfs module As of r363471, tmpfs is included in all GENERIC kernel configs. This results in a warning being emitted for each call to kldload(8): module_register: cannot register tmpfs from tmpfs.ko; already loaded from kernel Check for the presence of the module via kldstat first to quiet this warning. Reviewed by: asomers, arichardson Differential Revision: https://reviews.freebsd.org/D26632 Modified: head/contrib/netbsd-tests/fs/h_funcs.subr Modified: head/contrib/netbsd-tests/fs/h_funcs.subr ============================================================================== --- head/contrib/netbsd-tests/fs/h_funcs.subr Thu Oct 1 23:28:21 2020 (r366350) +++ head/contrib/netbsd-tests/fs/h_funcs.subr Fri Oct 2 00:52:31 2020 (r366351) @@ -45,7 +45,7 @@ require_fs() { # Begin FreeBSD if true; then - if kldload -n ${name}; then + if kldstat -qm ${name} || kldload -n ${name}; then found=yes else found=no