Stubdom test case

Currently only QEMU traditional supports stubdom and we want to
eventually do away with non-XSM test cases, so we only create

  test-amd64-{i386,amd64}-xl-qemut-stubdom-debianhvm-amd64-xsm

Note that stubdom only supports serial='pty'. Piping serial to stderr
causes stubdom to exit abnormally.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 853631ce46092b8a6ad9491ce933d518f823bb01..66a0d819a85dab9e9e6ec4d5674fea3ce9c8a487 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1653,7 +1653,6 @@ vncdisplay=0
 vnclisten='$ho->{Ip}'
 vncpasswd='$passwd'
 
-serial='file:/dev/stderr'
 #
 boot = 'dc'
 END
@@ -1668,6 +1667,14 @@ END
         $cfg .= "bios='$bios'\n";
     }
 
+    my $stubdom = guest_var_boolean($gho, 'stubdom');
+    if ($stubdom) {
+       $cfg .= "device_model_stubdomain_override=1\n";
+       $cfg .= "serial='pty'\n";
+    } else {
+       $cfg .= "serial='file:/dev/stderr'\n";
+    }
+
     $xopts{VifType} ||= "ioemu";
     my $cfgpath= prepareguest_part_xencfg($ho, $gho, $ram_mb, \%xopts, $cfg);
     target_cmd_root($ho, <<END);

diff --git a/make-flight b/make-flight
index 41c752003f7e1ecd4ff4098834ecc2ce014a4c42..78ace52de6642c0add101612e9ba161a022f540b 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -214,10 +214,19 @@ do_hvm_debian_test_one () {
   testname=$1
   bios=$2
   xsm=$3
+  stubdom=$4
 
-  job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-$testname-amd64\
+  stubdom_suffix=""
+  stubdom_runvar=""
+  if [ x$stubdom != x ]; 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 \
     enable_xsm=$xsm                             \
+    $stubdom_runvar                             \
     debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
     bios=$bios \
     all_hostflags=$most_hostflags,hvm
@@ -238,10 +247,13 @@ do_hvm_debian_tests() {
     done
   fi
 
-  # QEMU traditional supports rombios
+  # QEMU traditional supports rombios and stubdom
   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
+      fi
     done
   fi
 }