make-flight: Be more explicit about xen/dom0 combinations to test

In particular avoid amd64/armhf combo.

diff --git a/make-flight b/make-flight
index 7cc3f7b06212509e18774fbdfc755fd163d2cc04..080b9149ac2dc77dc01a57475ab6efb69b6a1729 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -233,12 +233,18 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
 
     for dom0arch in i386 amd64 armhf; do
 
+      case ${xenarch}_${dom0arch} in
+         amd64_amd64) ;;
+         amd64_i386) ;;
+         i386_i386) ;;
+         armhf_armhf) ;;
+         *) continue ;;
+      esac
+
       eval "
          arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\"
       "
 
-      if [ $dom0arch != $xenarch -a $xenarch != amd64 ]; then continue; fi
-
       if [ x$kern = x-xcpkern -a $dom0arch != i386 ]; then continue; fi
 
       most_hostflags="arch-$dom0arch,arch-xen-$xenarch,purpose-test"