[OSSTEST PATCH RFC v1 10/12] make-flight: create XSM test jobs

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

Duplicate Debian PV and HVM test jobs for XSM testing.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 make-flight |   35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/make-flight b/make-flight
index 9963a46..b157263 100755
--- a/make-flight
+++ b/make-flight
@@ -200,11 +200,21 @@ do_hvm_win7_x64_tests () {
 do_hvm_debian_test_one () {
   testname=$1
   bios=$2
+  xsm=$3
   job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-$testname-amd64\
     test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
+    enable_xsm=n                                \
     debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
     bios=$bios \
     all_hostflags=$most_hostflags,hvm
+  if [ x$xsm = xtrue ] ; then
+      job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-$testname-amd64-xsm\
+        test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
+        enable_xsm=y                                \
+        debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
+        bios=$bios \
+        all_hostflags=$most_hostflags,hvm
+  fi
 }
 
 do_hvm_debian_tests() {
@@ -214,13 +224,13 @@ do_hvm_debian_tests() {
 
   # QEMU upstream supports ovmf and seabios
   if [ "x$qemuu_suffix" == "x-qemuu" ]; then
-    do_hvm_debian_test_one ovmf ovmf
-    do_hvm_debian_test_one debianhvm seabios
+    do_hvm_debian_test_one ovmf ovmf false
+    do_hvm_debian_test_one debianhvm seabios true
   fi
 
   # QEMU traditional supports rombios
   if [ "x$qemuu_suffix" == "x-qemut" ]; then
-    do_hvm_debian_test_one debianhvm rombios
+    do_hvm_debian_test_one debianhvm rombios true
   fi
 }
 
@@ -283,12 +293,31 @@ do_passthrough_tests () {
 
 test_matrix_do_one () {
 
+  # xsm tests for versions > 4.4, arch amd64 and armhf
+  case "$xenbranch:$xenarch" in
+  xen-3.*-testing:*) test_xsm=n ;;
+  xen-4.0-testing:*) test_xsm=n ;;
+  xen-4.1-testing:*) test_xsm=n ;;
+  xen-4.2-testing:*) test_xsm=n ;;
+  xen-4.3-testing:*) test_xsm=n ;;
+  xen-4.4-testing:*) test_xsm=n ;;
+  *:amd64|armhf)     test_xsm=y ;;
+  esac
+
   # Basic PV Linux test with xl
 
   job_create_test test-$xenarch$kern-$dom0arch-xl test-debian xl \
             $xenarch $dom0arch                                   \
+            enable_xsm=n                                         \
             $debian_runvars all_hostflags=$most_hostflags
 
+  if [ x$test_xsm = xy ] ; then
+      job_create_test test-$xenarch$kern-$dom0arch-xl-xsm test-debian xl \
+              $xenarch $dom0arch                                   \
+              enable_xsm=y                                         \
+              $debian_runvars all_hostflags=$most_hostflags
+  fi
+
   job_create_test test-$xenarch$kern-$dom0arch-libvirt test-debian libvirt \
             $xenarch $dom0arch                                       \
             $debian_runvars all_hostflags=$most_hostflags
-- 
1.7.10.4