Date: Tue, 25 Mar 2014 13:39:32 +0000 (UTC) From: Julio Merino <jmmv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r263736 - in user/jmmv/autotest/node: . configs/kyua1 configs/kyua2 Message-ID: <201403251339.s2PDdWDE007004@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmmv Date: Tue Mar 25 13:39:31 2014 New Revision: 263736 URL: http://svnweb.freebsd.org/changeset/base/263736 Log: Add fib-related configuration variables to let some tests run. This is to allow a bunch of tests that were marked as skipped to actually run on the various configurations we support. Requested by asomers. 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 Tue Mar 25 13:18:09 2014 (r263735) +++ user/jmmv/autotest/node/configs/kyua1/head.conf Tue Mar 25 13:39:31 2014 (r263736) @@ -18,3 +18,17 @@ TESTS_TIMEOUT=3600 # TODO(jmmv): Remove this. lib32 builds are currently broken in combination # with the test suite, so we ought to fix that instead of disabling lib32. MKVARS="${MKVARS} WITHOUT_LIB32=yes" + +post_mkimage_hook() { + local chrootdir="${1}"; shift + + cat >>"${chrootdir}/boot/loader.conf" <<EOF +net.fibs = 4 +net.add_addr_allfibs = 0 +EOF + +cat >>"${chrootdir}/usr/local/etc/kyua/kyua.conf" <<EOF +test_suites.FreeBSD.allow_sysctl_side_effects = 1 +test_suites.FreeBSD.fibs = "2 3" +EOF +} Modified: user/jmmv/autotest/node/configs/kyua1/stable-10.conf ============================================================================== --- user/jmmv/autotest/node/configs/kyua1/stable-10.conf Tue Mar 25 13:18:09 2014 (r263735) +++ user/jmmv/autotest/node/configs/kyua1/stable-10.conf Tue Mar 25 13:39:31 2014 (r263736) @@ -18,3 +18,17 @@ TESTS_TIMEOUT=3600 # TODO(jmmv): Remove this. lib32 builds are currently broken in combination # with the test suite, so we ought to fix that instead of disabling lib32. MKVARS="${MKVARS} WITHOUT_LIB32=yes" + +post_mkimage_hook() { + local chrootdir="${1}"; shift + + cat >>"${chrootdir}/boot/loader.conf" <<EOF +net.fibs = 4 +net.add_addr_allfibs = 0 +EOF + +cat >>"${chrootdir}/usr/local/etc/kyua/kyua.conf" <<EOF +test_suites.FreeBSD.allow_sysctl_side_effects = 1 +test_suites.FreeBSD.fibs = "2 3" +EOF +} Modified: user/jmmv/autotest/node/configs/kyua2/head.conf ============================================================================== --- user/jmmv/autotest/node/configs/kyua2/head.conf Tue Mar 25 13:18:09 2014 (r263735) +++ user/jmmv/autotest/node/configs/kyua2/head.conf Tue Mar 25 13:39:31 2014 (r263736) @@ -18,3 +18,17 @@ TESTS_TIMEOUT=3600 # TODO(jmmv): Remove this. lib32 builds are currently broken in combination # with the test suite, so we ought to fix that instead of disabling lib32. MKVARS="${MKVARS} WITHOUT_LIB32=yes" + +post_mkimage_hook() { + local chrootdir="${1}"; shift + + cat >>"${chrootdir}/boot/loader.conf" <<EOF +net.fibs = 4 +net.add_addr_allfibs = 0 +EOF + +cat >>"${chrootdir}/usr/local/etc/kyua/kyua.conf" <<EOF +test_suites.FreeBSD.allow_sysctl_side_effects = 1 +test_suites.FreeBSD.fibs = "2 3" +EOF +} Modified: user/jmmv/autotest/node/configs/kyua2/stable-10.conf ============================================================================== --- user/jmmv/autotest/node/configs/kyua2/stable-10.conf Tue Mar 25 13:18:09 2014 (r263735) +++ user/jmmv/autotest/node/configs/kyua2/stable-10.conf Tue Mar 25 13:39:31 2014 (r263736) @@ -18,3 +18,17 @@ TESTS_TIMEOUT=3600 # TODO(jmmv): Remove this. lib32 builds are currently broken in combination # with the test suite, so we ought to fix that instead of disabling lib32. MKVARS="${MKVARS} WITHOUT_LIB32=yes" + +post_mkimage_hook() { + local chrootdir="${1}"; shift + + cat >>"${chrootdir}/boot/loader.conf" <<EOF +net.fibs = 4 +net.add_addr_allfibs = 0 +EOF + +cat >>"${chrootdir}/usr/local/etc/kyua/kyua.conf" <<EOF +test_suites.FreeBSD.allow_sysctl_side_effects = 1 +test_suites.FreeBSD.fibs = "2 3" +EOF +} Modified: user/jmmv/autotest/node/iterate.sh ============================================================================== --- user/jmmv/autotest/node/iterate.sh Tue Mar 25 13:18:09 2014 (r263735) +++ user/jmmv/autotest/node/iterate.sh Tue Mar 25 13:39:31 2014 (r263736) @@ -66,6 +66,8 @@ autotest_set_defaults() { shtk_config_set SVNROOT "svn://svn.FreeBSD.org/" shtk_config_set TARGET "amd64" shtk_config_set TARGET_ARCH "amd64" + + post_mkimage_hook() { true; } } @@ -218,6 +220,9 @@ kyua test shutdown -p now EOF + shtk_cli_info "Running custom setup hooks" + shtk_config_run_hook post_mkimage_hook "${chrootdir}/vmimage/mnt" + shtk_cli_info "Unmounting image file systems" cleanup_mkimage eval "cleanup_mkimage() { true; }" # Prevent double-execution on exit.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403251339.s2PDdWDE007004>