From owner-svn-src-user@FreeBSD.ORG Wed Mar 26 06:22:44 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C63BDB; Wed, 26 Mar 2014 06:22:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7916BD6D; Wed, 26 Mar 2014 06:22:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2Q6Mirp026263; Wed, 26 Mar 2014 06:22:44 GMT (envelope-from jmmv@svn.freebsd.org) Received: (from jmmv@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2Q6MhFC026258; Wed, 26 Mar 2014 06:22:43 GMT (envelope-from jmmv@svn.freebsd.org) Message-Id: <201403260622.s2Q6MhFC026258@svn.freebsd.org> From: Julio Merino Date: Wed, 26 Mar 2014 06:22:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r263761 - in user/jmmv/autotest/node: . configs/kyua1 configs/kyua2 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2014 06:22:44 -0000 Author: jmmv Date: Wed Mar 26 06:22:43 2014 New Revision: 263761 URL: http://svnweb.freebsd.org/changeset/base/263761 Log: Allow sys/netinet/fibs_test:arpresolve_checks_interface_fib to run. Do this by installing nmap and socat on the virtual machines (and by adding support to autotest to install arbitrary packages). Modified: user/jmmv/autotest/node/configs/kyua1/head.conf user/jmmv/autotest/node/configs/kyua1/stable-10.conf user/jmmv/autotest/node/configs/kyua2/head.conf user/jmmv/autotest/node/configs/kyua2/stable-10.conf user/jmmv/autotest/node/iterate.sh Modified: user/jmmv/autotest/node/configs/kyua1/head.conf ============================================================================== --- user/jmmv/autotest/node/configs/kyua1/head.conf Wed Mar 26 05:49:09 2014 (r263760) +++ user/jmmv/autotest/node/configs/kyua1/head.conf Wed Mar 26 06:22:43 2014 (r263761) @@ -15,6 +15,10 @@ TARGET=amd64 TARGET_ARCH=amd64 TESTS_TIMEOUT=3600 +PACKAGES= +# Required by sys/netinet/fibs_test:arpresolve_checks_interface_fib. +PACKAGES="${PACKAGES} nmap socat" + post_mkimage_hook() { local chrootdir="${1}"; shift Modified: user/jmmv/autotest/node/configs/kyua1/stable-10.conf ============================================================================== --- user/jmmv/autotest/node/configs/kyua1/stable-10.conf Wed Mar 26 05:49:09 2014 (r263760) +++ user/jmmv/autotest/node/configs/kyua1/stable-10.conf Wed Mar 26 06:22:43 2014 (r263761) @@ -15,6 +15,10 @@ TARGET=amd64 TARGET_ARCH=amd64 TESTS_TIMEOUT=3600 +PACKAGES= +# Required by sys/netinet/fibs_test:arpresolve_checks_interface_fib. +PACKAGES="${PACKAGES} nmap socat" + post_mkimage_hook() { local chrootdir="${1}"; shift Modified: user/jmmv/autotest/node/configs/kyua2/head.conf ============================================================================== --- user/jmmv/autotest/node/configs/kyua2/head.conf Wed Mar 26 05:49:09 2014 (r263760) +++ user/jmmv/autotest/node/configs/kyua2/head.conf Wed Mar 26 06:22:43 2014 (r263761) @@ -15,6 +15,10 @@ TARGET=i386 TARGET_ARCH=i386 TESTS_TIMEOUT=3600 +PACKAGES= +# Required by sys/netinet/fibs_test:arpresolve_checks_interface_fib. +PACKAGES="${PACKAGES} nmap socat" + post_mkimage_hook() { local chrootdir="${1}"; shift Modified: user/jmmv/autotest/node/configs/kyua2/stable-10.conf ============================================================================== --- user/jmmv/autotest/node/configs/kyua2/stable-10.conf Wed Mar 26 05:49:09 2014 (r263760) +++ user/jmmv/autotest/node/configs/kyua2/stable-10.conf Wed Mar 26 06:22:43 2014 (r263761) @@ -15,6 +15,10 @@ TARGET=i386 TARGET_ARCH=i386 TESTS_TIMEOUT=3600 +PACKAGES= +# Required by sys/netinet/fibs_test:arpresolve_checks_interface_fib. +PACKAGES="${PACKAGES} nmap socat" + post_mkimage_hook() { local chrootdir="${1}"; shift Modified: user/jmmv/autotest/node/iterate.sh ============================================================================== --- user/jmmv/autotest/node/iterate.sh Wed Mar 26 05:49:09 2014 (r263760) +++ user/jmmv/autotest/node/iterate.sh Wed Mar 26 06:22:43 2014 (r263761) @@ -41,8 +41,8 @@ shtk_import process # List of valid configuration variables. # # Please remember to update sysbuild.conf(5) if you change this list. -AUTOTEST_CONFIG_VARS="CHROOTDIR DATADIR IMAGE MKVARS SRCBRANCH SVNROOT \ - TARGET TARGET_ARCH TESTS_TIMEOUT" +AUTOTEST_CONFIG_VARS="CHROOTDIR DATADIR IMAGE MKVARS PACKAGES SRCBRANCH \ + SVNROOT TARGET TARGET_ARCH TESTS_TIMEOUT" # Paths to installed files. @@ -210,6 +210,10 @@ EOF cp /etc/resolv.conf "${chrootdir}/vmimage/mnt/etc" pkg -c "${chrootdir}/vmimage/mnt" install -y kyua perl5 pkgconf + if shtk_config_has PACKAGES; then + pkg -c "${chrootdir}/vmimage/mnt" install -y \ + $(shtk_config_get PACKAGES) + fi rm "${chrootdir}/vmimage/mnt/etc/resolv.conf" cat >>"${chrootdir}/vmimage/mnt/root/.cshrc" <