From owner-svn-src-user@FreeBSD.ORG Wed Jan 8 17:06:12 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 7CD2CEB5;
Wed, 8 Jan 2014 17:06:12 +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 501751D5A;
Wed, 8 Jan 2014 17:06:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08H6Cpd072401;
Wed, 8 Jan 2014 17:06:12 GMT (envelope-from jmmv@svn.freebsd.org)
Received: (from jmmv@localhost)
by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08H6CoG072400;
Wed, 8 Jan 2014 17:06:12 GMT (envelope-from jmmv@svn.freebsd.org)
Message-Id: <201401081706.s08H6CoG072400@svn.freebsd.org>
From: Julio Merino <jmmv@FreeBSD.org>
Date: Wed, 8 Jan 2014 17:06:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r260452 - user/jmmv/autotest/node
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" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jan 2014 17:06:12 -0000
Author: jmmv
Date: Wed Jan 8 17:06:11 2014
New Revision: 260452
URL: http://svnweb.freebsd.org/changeset/base/260452
Log:
Add support to build and test i386 releases.
Modified:
user/jmmv/autotest/node/iterate.sh
Modified: user/jmmv/autotest/node/iterate.sh
==============================================================================
--- user/jmmv/autotest/node/iterate.sh Wed Jan 8 17:05:01 2014 (r260451)
+++ user/jmmv/autotest/node/iterate.sh Wed Jan 8 17:06:11 2014 (r260452)
@@ -41,7 +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"
+AUTOTEST_CONFIG_VARS="CHROOTDIR DATADIR IMAGE MKVARS SRCBRANCH SVNROOT \
+ TARGET TARGET_ARCH"
# Paths to installed files.
@@ -63,6 +64,8 @@ autotest_set_defaults() {
shtk_config_set IMAGE "${AUTOTEST_ROOT}/image.disk"
shtk_config_set SRCBRANCH "base/head"
shtk_config_set SVNROOT "svn://svn.freebsd.org"
+ shtk_config_set TARGET "amd64"
+ shtk_config_set TARGET_ARCH "amd64"
}
@@ -114,6 +117,8 @@ NOPORTS=yes
SRCBRANCH="$(shtk_config_get SRCBRANCH)"
SRC_CONF="${src_conf}"
SVNROOT="$(shtk_config_get SVNROOT)"
+TARGET="$(shtk_config_get TARGET)"
+TARGET_ARCH="$(shtk_config_get TARGET_ARCH)"
EOF
local svnroot="$(shtk_config_get SVNROOT)/$(shtk_config_get SRCBRANCH)"
@@ -182,7 +187,10 @@ autotest_mkimage() {
shtk_cli_info "Installing system into image"
_generate_src_conf >"${chrootdir}/etc/src.conf"
- chroot "${chrootdir}" make -s -C /usr/src DESTDIR=/vmimage/mnt \
+ chroot "${chrootdir}" make -s -C /usr/src \
+ DESTDIR=/vmimage/mnt \
+ TARGET="$(shtk_config_get TARGET)" \
+ TARGET_ARCH="$(shtk_config_get TARGET_ARCH)" \
installworld installkernel distribution 2>&1 >/dev/null
shtk_cli_info "Setting up image configuration"
@@ -225,7 +233,23 @@ autotest_execute() {
# support qemu so that we can test non-amd64 platforms from our test cluster
# machines. In other words: the selection of the VMM has to be exposed in
# the configuration file.
- shtk_process_run qemu-system-x86_64 -nographic -drive file="${image}"
+ local target_arch="$(shtk_config_get TARGET_ARCH)"
+ case "${target_arch}" in
+ amd64)
+ shtk_process_run qemu-system-x86_64 -nographic \
+ -drive file="${image}"
+ ;;
+
+ i386)
+ shtk_process_run qemu-system-i386 -nographic \
+ -drive file="${image}"
+ ;;
+
+ *)
+ shtk_cli_error "Sorry, don't know how to run tests for" \
+ "${target_arch}"
+ ;;
+ esac
}