From owner-svn-src-head@freebsd.org Sun Dec 3 18:35:09 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 092EEE5E8C0; Sun, 3 Dec 2017 18:35:09 +0000 (UTC) (envelope-from kp@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 mx1.freebsd.org (Postfix) with ESMTPS id D6C542708; Sun, 3 Dec 2017 18:35:08 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB3IZ7l1004209; Sun, 3 Dec 2017 18:35:07 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB3IZ7K0004201; Sun, 3 Dec 2017 18:35:07 GMT (envelope-from kp@FreeBSD.org) Message-Id: <201712031835.vB3IZ7K0004201@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Sun, 3 Dec 2017 18:35:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326500 - head/tests/sys/netipsec/tunnel X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/tests/sys/netipsec/tunnel X-SVN-Commit-Revision: 326500 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.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2017 18:35:09 -0000 Author: kp Date: Sun Dec 3 18:35:07 2017 New Revision: 326500 URL: https://svnweb.freebsd.org/changeset/base/326500 Log: tests: ipsec: Don't load/unload aesni.ko in the test header We can't kldunload in the test head as Kyua interprets any output from them. This would lead to syntax errors and skipping the entire file. Move the kld commands into the test case bodies. Pointed out by: asomers@ Modified: head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh head/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh head/tests/sys/netipsec/tunnel/aes_gcm_128.sh head/tests/sys/netipsec/tunnel/aes_gcm_256.sh head/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh head/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh head/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh head/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh Modified: head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh ============================================================================== --- head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh Sun Dec 3 16:57:28 2017 (r326499) +++ head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh Sun Dec 3 18:35:07 2017 (r326500) @@ -7,12 +7,13 @@ v4_head() { atf_set descr 'IPSec inet4 tunnel using aes-cbc-128-hmac-sha1' atf_set require.user root - # Unload AESNI module if loaded - kldstat -q -n aesni && kldunload aesni } v4_body() { + # Unload AESNI module if loaded + kldstat -q -n aesni && kldunload aesni + ist_test 4 rijndael-cbc "1234567890123456" hmac-sha1 "12345678901234567890" } @@ -26,12 +27,13 @@ v6_head() { atf_set descr 'IPSec inet6 tunnel using aes-cbc-128-hmac-sha1' atf_set require.user root - # Unload AESNI module if loaded - kldstat -q -n aesni && kldunload aesni } v6_body() { + # Unload AESNI module if loaded + kldstat -q -n aesni && kldunload aesni + ist_test 6 rijndael-cbc "1234567890123456" hmac-sha1 "12345678901234567890" } Modified: head/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh ============================================================================== --- head/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh Sun Dec 3 16:57:28 2017 (r326499) +++ head/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh Sun Dec 3 18:35:07 2017 (r326500) @@ -7,12 +7,13 @@ v4_head() { atf_set descr 'IPSec inet4 tunnel using aes-cbc-256-hmac-sha2-256' atf_set require.user root - # load AESNI module if not already - kldstat -q -n aesni || kldload aesni } v4_body() { + # load AESNI module if not already + kldstat -q -n aesni || kldload aesni + ist_test 4 rijndael-cbc "12345678901234567890123456789012" hmac-sha2-256 "12345678901234567890123456789012" } @@ -26,12 +27,13 @@ v6_head() { atf_set descr 'IPSec inet6 tunnel using aes-cbc-256-hmac-sha2-256' atf_set require.user root - # load AESNI module if not already - kldstat -q -n aesni || kldload aesni } v6_body() { + # load AESNI module if not already + kldstat -q -n aesni || kldload aesni + ist_test 6 rijndael-cbc "12345678901234567890123456789012" hmac-sha2-256 "12345678901234567890123456789012" } Modified: head/tests/sys/netipsec/tunnel/aes_gcm_128.sh ============================================================================== --- head/tests/sys/netipsec/tunnel/aes_gcm_128.sh Sun Dec 3 16:57:28 2017 (r326499) +++ head/tests/sys/netipsec/tunnel/aes_gcm_128.sh Sun Dec 3 18:35:07 2017 (r326500) @@ -7,12 +7,13 @@ v4_head() { atf_set descr 'IPSec inet4 tunnel using aes-gcm-128' atf_set require.user root - # Unload AESNI module if loaded - kldstat -q -n aesni && kldunload aesni } v4_body() { + # Unload AESNI module if loaded + kldstat -q -n aesni && kldunload aesni + ist_test 4 aes-gcm-16 "12345678901234567890" } @@ -26,12 +27,13 @@ v6_head() { atf_set descr 'IPSec inet6 tunnel using aes-gcm-128' atf_set require.user root - # Unload AESNI module if loaded - kldstat -q -n aesni && kldunload aesni } v6_body() { + # Unload AESNI module if loaded + kldstat -q -n aesni && kldunload aesni + ist_test 6 aes-gcm-16 "12345678901234567890" } Modified: head/tests/sys/netipsec/tunnel/aes_gcm_256.sh ============================================================================== --- head/tests/sys/netipsec/tunnel/aes_gcm_256.sh Sun Dec 3 16:57:28 2017 (r326499) +++ head/tests/sys/netipsec/tunnel/aes_gcm_256.sh Sun Dec 3 18:35:07 2017 (r326500) @@ -7,12 +7,13 @@ v4_head() { atf_set descr 'IPSec inet4 tunnel using aes-gcm-256' atf_set require.user root - # Unload AESNI module if loaded - kldstat -q -n aesni && kldunload aesni } v4_body() { + # Unload AESNI module if loaded + kldstat -q -n aesni && kldunload aesni + ist_test 4 aes-gcm-16 "123456789012345678901234567890123456" } @@ -26,12 +27,13 @@ v6_head() { atf_set descr 'IPSec inet6 tunnel using aes-gcm-256' atf_set require.user root - # Unload AESNI module if loaded - kldstat -q -n aesni && kldunload aesni } v6_body() { + # Unload AESNI module if loaded + kldstat -q -n aesni && kldunload aesni + ist_test 6 aes-gcm-16 "123456789012345678901234567890123456" } Modified: head/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh ============================================================================== --- head/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh Sun Dec 3 16:57:28 2017 (r326499) +++ head/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh Sun Dec 3 18:35:07 2017 (r326500) @@ -7,12 +7,13 @@ v4_head() { atf_set descr 'IPSec inet4 tunnel using aes-cbc-128-hmac-sha1 and AESNI' atf_set require.user root - # load AESNI module if not already - kldstat -q -n aesni || kldload aesni } v4_body() { + # load AESNI module if not already + kldstat -q -n aesni || kldload aesni + ist_test 4 rijndael-cbc "1234567890123456" hmac-sha1 "12345678901234567890" } @@ -26,12 +27,13 @@ v6_head() { atf_set descr 'IPSec inet6 tunnel using aes-cbc-128-hmac-sha1 and AESNI' atf_set require.user root - # load AESNI module if not already - kldstat -q -n aesni || kldload aesni } v6_body() { + # load AESNI module if not already + kldstat -q -n aesni || kldload aesni + ist_test 6 rijndael-cbc "1234567890123456" hmac-sha1 "12345678901234567890" } Modified: head/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh ============================================================================== --- head/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh Sun Dec 3 16:57:28 2017 (r326499) +++ head/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh Sun Dec 3 18:35:07 2017 (r326500) @@ -7,12 +7,13 @@ v4_head() { atf_set descr 'IPSec inet4 tunnel using aes-cbc-256-hmac-sha2-256 and AESNI' atf_set require.user root - # Unload AESNI module if loaded - kldstat -q -n aesni && kldunload aesni } v4_body() { + # Unload AESNI module if loaded + kldstat -q -n aesni && kldunload aesni + ist_test 4 rijndael-cbc "12345678901234567890123456789012" hmac-sha2-256 "12345678901234567890123456789012" } @@ -26,12 +27,13 @@ v6_head() { atf_set descr 'IPSec inet6 tunnel using aes-cbc-256-hmac-sha2-256 and AESNI' atf_set require.user root - # Unload AESNI module if loaded - kldstat -q -n aesni && kldunload aesni } v6_body() { + # Unload AESNI module if loaded + kldstat -q -n aesni && kldunload aesni + ist_test 6 rijndael-cbc "12345678901234567890123456789012" hmac-sha2-256 "12345678901234567890123456789012" } Modified: head/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh ============================================================================== --- head/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh Sun Dec 3 16:57:28 2017 (r326499) +++ head/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh Sun Dec 3 18:35:07 2017 (r326500) @@ -7,12 +7,13 @@ v4_head() { atf_set descr 'IPSec inet4 tunnel using aes-gcm-128 and AESNI' atf_set require.user root - # load AESNI module if not already - kldstat -q -n aesni || kldload aesni } v4_body() { + # load AESNI module if not already + kldstat -q -n aesni || kldload aesni + ist_test 4 aes-gcm-16 "12345678901234567890" } @@ -26,12 +27,13 @@ v6_head() { atf_set descr 'IPSec inet6 tunnel using aes-gcm-128 and AESNI' atf_set require.user root - # load AESNI module if not already - kldstat -q -n aesni || kldload aesni } v6_body() { + # load AESNI module if not already + kldstat -q -n aesni || kldload aesni + atf_expect_fail "PR 201447" ist_test 6 aes-gcm-16 "12345678901234567890" } Modified: head/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh ============================================================================== --- head/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh Sun Dec 3 16:57:28 2017 (r326499) +++ head/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh Sun Dec 3 18:35:07 2017 (r326500) @@ -7,12 +7,13 @@ v4_head() { atf_set descr 'IPSec inet4 tunnel using aes-gcm-256 and AESNI' atf_set require.user root - # load AESNI module if not already - kldstat -q -n aesni || kldload aesni } v4_body() { + # load AESNI module if not already + kldstat -q -n aesni || kldload aesni + ist_test 4 aes-gcm-16 "123456789012345678901234567890123456" } @@ -26,12 +27,13 @@ v6_head() { atf_set descr 'IPSec inet6 tunnel using aes-gcm-256 and AESNI' atf_set require.user root - # load AESNI module if not already - kldstat -q -n aesni || kldload aesni } v6_body() { + # load AESNI module if not already + kldstat -q -n aesni || kldload aesni + atf_expect_fail "PR 201447" ist_test 6 aes-gcm-16 "123456789012345678901234567890123456" }