make-flight: reorganize scheduling related test jobs

Scheduling related tests are ok to run on ARM, so do
not cut them off. They also do not depend on a
particular Dom0 architecture.

The net effect is that the following tests are removed:
 test-amd64-i386-xl-credit2
 test-amd64-i386-xl-multivcpu

while the following new ones are created:
 test-amd64-amd64-xl-credit2
 test-amd64-amd64-xl-multivcpu
 test-armhf-armhf-xl-credit2
 test-armhf-armhf-xl-multivcpu
 test-armhf-armhf-xl-sedf
 test-armhf-armhf-xl-sedf-pin

Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/make-flight b/make-flight
index 97e7a06c7eab4ac8eb1489155494903fde0360c1..9b499d82c166a1bd7aacca1ec54591462d05a36b 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -242,7 +242,7 @@ do_hvm_rhel6_tests () {
 }
 
 do_sedf_tests () {
-  if [ $xenarch != amd64 -o $dom0arch != amd64 ]; then
+  if [ $xenarch != $dom0arch ]; then
     return
   fi
 
@@ -257,7 +257,7 @@ do_sedf_tests () {
 }
 
 do_credit2_tests () {
-  if [ $xenarch != amd64 -o $dom0arch != i386 ]; then
+  if [ $xenarch != $dom0arch ]; then
     return
   fi
 
@@ -267,6 +267,16 @@ do_credit2_tests () {
             $debian_runvars all_hostflags=$most_hostflags
 }
 
+do_multivcpu_tests () {
+  if [ $xenarch != $dom0arch ]; then
+    return
+  fi
+
+  job_create_test test-$xenarch$kern-$dom0arch-xl-multivcpu \
+                    test-debian xl $xenarch $dom0arch guests_vcpus=4  \
+                    $debian_runvars all_hostflags=$most_hostflags
+}
+
 do_passthrough_tests () {
   if [ $xenarch != amd64 -o $dom0arch != amd64 -o "$kern" != "" ]; then
     return
@@ -298,6 +308,10 @@ test_matrix_do_one () {
             $xenarch $dom0arch                                       \
             $debian_runvars all_hostflags=$most_hostflags
 
+  do_multivcpu_tests
+  do_sedf_tests
+  do_credit2_tests
+
   # No further arm tests at the moment
   if [ $dom0arch = armhf ]; then
       return
@@ -369,17 +383,6 @@ test_matrix_do_one () {
             $debian_runvars \
             all_hostflags=$most_hostflags,equiv-1
 
-  do_sedf_tests
-  do_credit2_tests
-
-  if [ $xenarch = amd64 -a $dom0arch = i386 ]; then
-
-  job_create_test test-$xenarch$kern-$dom0arch-xl-multivcpu \
-                    test-debian xl $xenarch $dom0arch guests_vcpus=4  \
-                    $debian_runvars all_hostflags=$most_hostflags
-
-  fi
-
   if [ x$test_pvh = xy -a $xenarch = amd64 -a $dom0arch = amd64 ]; then
 
     for cpuvendor in amd intel; do