From owner-svn-src-head@freebsd.org Sun Dec 3 18:21:00 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 BB61BE5E2C1; Sun, 3 Dec 2017 18:21:00 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-lf0-x22e.google.com (mail-lf0-x22e.google.com [IPv6:2a00:1450:4010:c07::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3CEE41E38; Sun, 3 Dec 2017 18:21:00 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-lf0-x22e.google.com with SMTP id l81so16704920lfl.6; Sun, 03 Dec 2017 10:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=BiDkJnTCtMFgQjlF8ScFY1FhIwjOj8xzbWqcgoUiG8A=; b=HDnxY+bwh4I6xcolwzhTg1wiY1uLequyTJpiXHMTvsjwY9ksHJv8GroqzZsnIY0euT 9VFpb6zJbqx8CU7p3t+YhflaR6cZnfoMLcZRarqtMkT5X1PitBO918TrDSN3ppCcowPl VTnsCbnftbnVx20mzXbOazKKnr9KeJG/6Xj1a3arCRKbr2zyjSuQAn7zCwkf6fo8zYvp DgswiUkf91WrLlrWWsJHjCpw53cVAPJprF6Ub4SA9XI8d3UhMWrfwDgeVQ2wMqn7+nVf GUjdT5dJmmqlBJlBhIphhxBG8iGisp5mf/k5nEjhGJNK249Z1SdZxSga19WN7shEYtx3 ix5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=BiDkJnTCtMFgQjlF8ScFY1FhIwjOj8xzbWqcgoUiG8A=; b=M4v8txUR2CI2d/KwG6APG+dXgwfID3hXXqGhosn49R/TDuXSa1tGwLDz+t0ZGyirNU E88W4UrA1KDnaFf+cyjzKILpeJ2B+qxreccaFWn111xNe5jKiiCaAaIdGbDUcfQpUEjc LWAb731LxJ1K84CBuB5UCbC9Vwua6TNwgjLvIX4M9T/sO7wf+XCJyJ58pkg3S/1oqj2d 0TiqMwj8XI5sX1UwUmeVR9dmH43skqHZygBhABEN+3LYJdZ2+OA9KbzAuptYXsjAQd9L ju+RHADuzDP8xVKOHGlSNeFdTElDW75uXYnRea22A6H5GF9giaRPo2FCDz+2/4OyBsz3 ZHfQ== X-Gm-Message-State: AJaThX5zV7kx6R7DPzcmhiIbzCfW8YMXA7w396n06SjdlDGbza/DQ5qH djpmIXUQ3PbsfU2xNIJKIlyHe7+bPUOLTP6k1Gs= X-Google-Smtp-Source: AGs4zMaYpm9Dk3mX3HEJ32U1YFg3AVEp+khe+Y6L91lKQ120+HjZyELXKMYCJbMSpQe14Orvh97aXV4gzOQN8jsFJZ4= X-Received: by 10.25.27.18 with SMTP id b18mr6160322lfb.177.1512325256716; Sun, 03 Dec 2017 10:20:56 -0800 (PST) MIME-Version: 1.0 Sender: asomers@gmail.com Received: by 10.179.76.19 with HTTP; Sun, 3 Dec 2017 10:20:56 -0800 (PST) In-Reply-To: <201712031352.vB3DqZF3084841@repo.freebsd.org> References: <201712031352.vB3DqZF3084841@repo.freebsd.org> From: Alan Somers Date: Sun, 3 Dec 2017 11:20:56 -0700 X-Google-Sender-Auth: qns-gEZsBogYj9eX5MknFFqbbNk Message-ID: Subject: Re: svn commit: r326497 - in head: etc/mtree tests/sys tests/sys/netipsec tests/sys/netipsec/tunnel To: Kristof Provost Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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:21:00 -0000 On Sun, Dec 3, 2017 at 6:52 AM, Kristof Provost wrote: > Author: kp > Date: Sun Dec 3 13:52:35 2017 > New Revision: 326497 > URL: https://svnweb.freebsd.org/changeset/base/326497 > > Log: > Add IPSec tests in tunnel mode > > Some IPSec in tunnel mode allowing to test multiple IPSec > configurations. These tests are reusing the jail/vnet scripts from pf > tests for generating complex network. > > Submitted by: olivier@ > Differential Revision: https://reviews.freebsd.org/D13017 > > Added: > head/tests/sys/netipsec/ > head/tests/sys/netipsec/Makefile (contents, props changed) > head/tests/sys/netipsec/tunnel/ > head/tests/sys/netipsec/tunnel/Makefile (contents, props changed) > head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh (contents, > props changed) > head/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh > (contents, props changed) > head/tests/sys/netipsec/tunnel/aes_gcm_128.sh (contents, props > changed) > head/tests/sys/netipsec/tunnel/aes_gcm_256.sh (contents, props > changed) > head/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh > (contents, props changed) > head/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh > (contents, props changed) > head/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh (contents, props > changed) > head/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh (contents, props > changed) > head/tests/sys/netipsec/tunnel/empty.sh (contents, props changed) > head/tests/sys/netipsec/tunnel/utils.subr (contents, props changed) > Modified: > head/etc/mtree/BSD.tests.dist > head/tests/sys/Makefile > > > Added: head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh > ============================================================ > ================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh Sun Dec > 3 13:52:35 2017 (r326497) > @@ -0,0 +1,47 @@ > +# $FreeBSD$ > + > +. $(atf_get_srcdir)/utils.subr > + > +atf_test_case "v4" "cleanup" > +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 > +} > > It's not ok to use kldunload during the test heads. Everything in the head methods gets executed when you do "kyua list". Anything output gets interpreted by Kyua. In this case, if kldunload outputs anything at all, Kyua will consider it to be a syntax error, and it will skip the entire file. You should limit yourself to using just atf_set in the header. Move the kld commands into the test case bodies. -Alan