From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH OSSTEST v2 11/13] make-flight: debian hvm tests with libvirt Date: Sun, 12 Jul 2015 17:20:34 +0100 Message-ID: <1436718036-7985-12-git-send-email-wei.liu2@citrix.com> References: <1436718036-7985-1-git-send-email-wei.liu2@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 1ZEKNU-000406-Vg for xen-devel@lists.xenproject.org; Sun, 12 Jul 2015 16:45:21 +0000 In-Reply-To: <1436718036-7985-1-git-send-email-wei.liu2@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 Cc: ian.jackson@eu.citrix.com, Wei Liu , ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org Since upstream QEMU is the default, that's what libvirt is using. We generate test case to test libvirt with upstream QEMU. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson --- make-flight | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/make-flight b/make-flight index c763ce9..96c6fe5 100755 --- a/make-flight +++ b/make-flight @@ -96,7 +96,9 @@ job_create_test_filter_callback () { *) case "$job" in *-qemuu-*) - if [ "x$toolstack" != xxl ]; then return 1; fi + if [ x$toolstack != xxl -a x$toolstack != xlibvirt ];then + return 1; + fi ;; esac ;; @@ -215,16 +217,17 @@ do_hvm_debian_test_one () { bios=$2 xsm=$3 stubdom=$4 + toolstack=$5 stubdom_suffix="" stubdom_runvar="" - if [ x$stubdom != x ]; then + if [ x$stubdom = xtrue ]; then stubdom_suffix="-stubdom" stubdom_runvar="debianhvm_stubdom=$stubdom" fi - job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix$stubdom_suffix-$testname-amd64\ - test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \ + job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix$stubdom_suffix-$testname-amd64\ + test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \ enable_xsm=$xsm \ $stubdom_runvar \ debianhvm_image=debian-7.2.0-amd64-CD-1.iso \ @@ -239,20 +242,26 @@ do_hvm_debian_tests() { return fi - # QEMU upstream supports ovmf and seabios + # QEMU upstream supports + # 1. ovmf + xl + # 2. seabios + xl + # 3. seabios + libvirt if [ "x$qemuu_suffix" == "x-qemuu" ]; then - do_hvm_debian_test_one ovmf ovmf false + do_hvm_debian_test_one ovmf ovmf false false xl for xsm in $xsms ; do - do_hvm_debian_test_one debianhvm seabios $xsm + for toolstack in xl libvirt; do + do_hvm_debian_test_one debianhvm seabios $xsm false $toolstack + done done fi # QEMU traditional supports rombios and stubdom + # Only test xl with QEMU traditional if [ "x$qemuu_suffix" == "x-qemut" ]; then for xsm in $xsms ; do - do_hvm_debian_test_one debianhvm rombios $xsm - if [ x$xsm = xtrue ]; then - do_hvm_debian_test_one debianhvm rombios $xsm true + do_hvm_debian_test_one debianhvm rombios $xsm false xl + if [ x$xsm = xtrue -a x$toolstack = xxl ]; then + do_hvm_debian_test_one debianhvm rombios $xsm true xl fi done fi -- 1.9.1