Date: Wed, 26 Mar 2014 06:22:43 +0000 (UTC) From: Julio Merino <jmmv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r263761 - in user/jmmv/autotest/node: . configs/kyua1 configs/kyua2 Message-ID: <201403260622.s2Q6MhFC026258@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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" <<EOF
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403260622.s2Q6MhFC026258>