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.jack...@eu.citrix.com> Acked-by: Ian Campbell <ian.campb...@citrix.com> --- v2: Fix textual conflict after dropping "make-flight: Allow separate specification of pre-built Xen vs others" --- mfi-common | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mfi-common b/mfi-common index aaaeac9..f83e9ec 100644 --- 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 -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel