make-flight: Run job_create_test_filter_callback on true job name

job_create_test would pass $job to job_create_test_filter_callback but
then later maybe append -xsm to it.  Fix this.

No functional change for existing in-tree code because all existing
tests of the $job end in *.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Fix textual conflict after dropping "make-flight: Allow separate
    specification of pre-built Xen vs others"

diff --git a/mfi-common b/mfi-common
index 2db89b705cb78dcdb79782ec7345e8b64854406d..869b299a9d66e1305180f5eb0a4086a91a1460a7 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -311,8 +311,6 @@ create_build_jobs () {
 }
 
 job_create_test () {
-  job_create_test_filter_callback "$@" || return 0
-
   local job=$1; shift
   local recipe=$1; shift
   local toolstack=$1; shift
@@ -327,6 +325,10 @@ job_create_test () {
   job="$job$xsm_suffix"
   xenbuildjob="${bfi}build-$xenarch$xsm_suffix"
   buildjob="${bfi}build-$dom0arch$xsm_suffix"
+
+  job_create_test_filter_callback \
+    "$job" "$recipe" "$toolstack" "$xenarch" "$dom0arch" "$@" || return 0
+
   tsbuildjob=
 
   case "$xenbranch:$toolstack" in