From owner-svn-src-head@freebsd.org  Thu Aug 16 15:44:49 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4643106B3A2;
 Thu, 16 Aug 2018 15:44:49 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 52855891AB;
 Thu, 16 Aug 2018 15:44:49 +0000 (UTC)
 (envelope-from asomers@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 3486E1B749;
 Thu, 16 Aug 2018 15:44:49 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7GFinvp055767;
 Thu, 16 Aug 2018 15:44:49 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7GFinK3055766;
 Thu, 16 Aug 2018 15:44:49 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201808161544.w7GFinK3055766@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 16 Aug 2018 15:44:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r337911 - head/tests/sys/opencrypto
X-SVN-Group: head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: head/tests/sys/opencrypto
X-SVN-Commit-Revision: 337911
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2018 15:44:49 -0000

Author: asomers
Date: Thu Aug 16 15:44:48 2018
New Revision: 337911
URL: https://svnweb.freebsd.org/changeset/base/337911

Log:
  Fix the sys/opencrypto/runtests test when aesni(4) is already loaded
  
  Apparently kldstat requires the full module name, including busname
  
  Reported by:	Jenkins
  MFC after:	2 weeks

Modified:
  head/tests/sys/opencrypto/runtests.sh

Modified: head/tests/sys/opencrypto/runtests.sh
==============================================================================
--- head/tests/sys/opencrypto/runtests.sh	Thu Aug 16 15:32:17 2018	(r337910)
+++ head/tests/sys/opencrypto/runtests.sh	Thu Aug 16 15:44:48 2018	(r337911)
@@ -50,9 +50,9 @@ cleanup_tests()
 }
 trap cleanup_tests EXIT INT TERM
 
-for required_module in aesni cryptodev; do
+for required_module in nexus/aesni cryptodev; do
 	if ! kldstat -q -m $required_module; then
-		kldload $required_module
+		kldload ${required_module#nexus/}
 		loaded_modules="$loaded_modules $required_module"
 	fi
 done