[PATCH OSSTEST 10/12] make-flight: debian hvm tests with libvirt

[Wei Liu <wei.liu2@citrix.com>]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 make-flight | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/make-flight b/make-flight
index 8ac3a87..dabcacd 100755
--- a/make-flight
+++ b/make-flight
@@ -92,7 +92,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
       ;;
@@ -208,9 +210,10 @@ do_hvm_debian_test_one () {
   testname=$1
   bios=$2
   xsm=$3
+  toolstack=$4
 
-  job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-$testname-amd64\
-    test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
+  job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix-$testname-amd64\
+    test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \
     enable_xsm=$xsm                             \
     debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
     bios=$bios \
@@ -226,16 +229,20 @@ do_hvm_debian_tests() {
 
   # QEMU upstream supports ovmf and seabios
   if [ "x$qemuu_suffix" == "x-qemuu" ]; then
-    do_hvm_debian_test_one ovmf ovmf false
-    for xsm in $xsms ; do
-      do_hvm_debian_test_one debianhvm seabios $xsm
+    for toolstack in xl libvirt; do
+      do_hvm_debian_test_one ovmf ovmf false $toolstack
+      for xsm in $xsms ; do
+        do_hvm_debian_test_one debianhvm seabios $xsm $toolstack
+      done
     done
   fi
 
   # QEMU traditional supports rombios
   if [ "x$qemuu_suffix" == "x-qemut" ]; then
     for xsm in $xsms ; do
-      do_hvm_debian_test_one debianhvm rombios $xsm
+      for toolstack in xl libvirt; do
+        do_hvm_debian_test_one debianhvm rombios $xsm $toolstack
+      done
     done
   fi
 }
-- 
1.9.1