make-flight: in 4.2 and later, use xl for pair tests

diff --git a/make-flight b/make-flight
index 39f59a914a2130273e547f5d5621a4844327d89e..c1bfef6ca2a0565248491a6d8f9c803d2a6965a0 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -218,6 +218,11 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
        ;;
   esac
 
+  case "$xenbranch" in
+  3.*|4.1)     onetoolstack=xend ;;
+  *)           onetoolstack=xl ;;
+  esac
+
   for kern in ''; do
 
     case $kern in
@@ -344,7 +349,8 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
 
       done # qemuu_suffix
 
-      job_create_test test-$xenarch$kern-$dom0arch-pair test-pair xend \
+      job_create_test test-$xenarch$kern-$dom0arch-pair test-pair \
+               $onetoolstack \
                 !host !host_hostflags \
                debian_kernkind=$kernkind                                 \
                debian_arch=$dom0arch                                     \