[OSSTEST PATCH 1/3] make-flight: Factor out do_hvm_win_test_one

[Ian Jackson <ian.jackson@eu.citrix.com>]

No functional change.  (Verified with
standalone-generate-dump-flight-runvars.)

Don't bother messing with do_hvm_winxp_tests as 1. that uses testids
without the guest arch, so isn't compatible with this unless we make
it more general 2. we intend to abolish that for most branches
shortly.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 make-flight | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/make-flight b/make-flight
index f513b80..e9016fc 100755
--- a/make-flight
+++ b/make-flight
@@ -292,18 +292,35 @@ do_hvm_winxp_tests () {
   done
 }
 
-do_hvm_win7_x64_tests () {
+do_hvm_win_test_one () {
+  local testidpart=$1
+  local isobase=$2
+  local guestarch=$3
+
   if [ $xenarch != amd64 ]; then
     return
   fi
 
-  job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-win7-amd64 \
+  case "$guestarch" in
+    amd64)  win_arch=x64 ;;
+    i386)   win_arch=x86 ;;
+    *)      win_arch=$guestarch ;; # probably wrong
+  esac
+
+  local iso=$isobase-$win_arch.iso
+
+  job_create_test \
+      test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-$testidpart-$guestarch \
             test-win xl $xenarch $dom0arch $qemuu_runvar \
-            win_image=win7-x64.iso \
+            win_image=$iso \
             win_acpi_shutdown=true \
             all_hostflags=$most_hostflags,hvm
 }
 
+do_hvm_win7_x64_tests () {
+  do_hvm_win_test_one win7 win7 amd64
+}
+
 do_hvm_debian_nested_tests () {
   bios=$1
 
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel