make-flight: Test rump kernels only when needed

Introduce a new subroutine branch_wants_rumpkernel_tests and call it
before making the rumpuserxen build and test jobs.

The default is not to include a rumpuserxen test.  We include it for
rumpuserxen itself, xen, linux (in case there is a frontend/backend
incompatibility), and osstest.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/make-flight b/make-flight
index a53fab07434a4257a5889bf17a8fee3491c5d68f..fbda440a92bf68c1b46ccc74becb7c2e5ec668f2 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -116,6 +116,8 @@ test_matrix_branch_filter_callback () {
 }
 
 do_rumpkernel_tests () {
+  branch_wants_rumpkernel_tests || return 0
+
   rumparch=$dom0arch
   job_create_test test-$xenarch$kern-$dom0arch-rumpuserxen-$rumparch \
                       test-rumpuserxen xl \

diff --git a/mfi-common b/mfi-common
index d1b2737fe3d4d1af6b613878b9642328e2b88d0b..5dcb2ee466144931433fd2b2a211883971c1da2f 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -31,6 +31,16 @@ stripy () {
   eval "$out_vn=\"\$out_$out_val\""
 }
 
+branch_wants_rumpkernel_tests () {
+  case "$branch" in
+  osstest*) return 0;;
+  rump*)    return 0;;
+  xen*)     return 0;;
+  linux*)   return 0;;
+  *)        return 1;;
+  esac
+}
+
 create_build_jobs () {
 
   local arch
@@ -180,6 +190,8 @@ create_build_jobs () {
 
     fi
 
+    if branch_wants_rumpkernel_tests; then
+
     case $arch in
     i386|amd64)
     ./cs-job-create $flight build-$arch-rumpuserxen build-rumpuserxen        \
@@ -197,6 +209,8 @@ create_build_jobs () {
                ;;
     esac
 
+    fi
+
     case "$arch" in
     armhf) continue;; # don't do any other kernel builds
     esac