From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 21/27] make-flight: Contemplate varying architecture for Debian HVM Date: Wed, 16 Sep 2015 14:35:24 +0100 Message-ID: <1442410530-9665-22-git-send-email-ian.jackson@eu.citrix.com> References: <1442410530-9665-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcCsS-0000rv-3G for xen-devel@lists.xenproject.org; Wed, 16 Sep 2015 13:36:00 +0000 In-Reply-To: <1442410530-9665-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org In the Debian hvm tests, ask branch_debianhvm_arch for the architecture to use. This currently prints only amd64. While we are here, provide some comments about the (somewhat confusing) argument conventions of do_hvm_debian_test_one. No functional change yet. Signed-off-by: Ian Jackson --- make-flight | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/make-flight b/make-flight index 6db3550..2246411 100755 --- a/make-flight +++ b/make-flight @@ -236,12 +236,20 @@ do_hvm_win7_x64_tests () { all_hostflags=$most_hostflags,hvm } +branch_debianhvm_arch () { + case $branch in + *) echo amd64;; + esac +} + do_hvm_debian_test_one () { testname=$1 toolstack=$2 bios=$3 - xsm=$4 - stubdom=$5 + xsm=$4 # 'false' or 'true' + stubdom=$5 # '' (or unset) or 'true' + + local arch=$(branch_debianhvm_arch) stubdom_suffix="" stubdom_runvar="" @@ -250,11 +258,11 @@ do_hvm_debian_test_one () { stubdom_runvar="debianhvm_stubdom=$stubdom" fi - job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix$stubdom_suffix-$testname-amd64\ + job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix$stubdom_suffix-$testname-$arch\ test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \ enable_xsm=$xsm \ $stubdom_runvar \ - debianhvm_image=debian-7.2.0-amd64-CD-1.iso \ + debianhvm_image=debian-7.2.0-$arch-CD-1.iso \ bios=$bios \ all_hostflags=$most_hostflags,hvm } -- 1.7.10.4