From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 22/27] make-flight: Run job_create_test_filter_callback on true job name Date: Wed, 16 Sep 2015 14:35:25 +0100 Message-ID: <1442410530-9665-23-git-send-email-ian.jackson@eu.citrix.com> References: <1442410530-9665-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcCsG-0000bn-0u for xen-devel@lists.xenproject.org; Wed, 16 Sep 2015 13:35:48 +0000 In-Reply-To: <1442410530-9665-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 --- mfi-common | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mfi-common b/mfi-common index af98f2d..6ffa9e6 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 @@ -323,8 +321,11 @@ job_create_test () { case " $* " in *" enable_xsm=true "*) xsm_suffix="-xsm"; esac - job="$job$xsm_suffix" + + job_create_test_filter_callback \ + "$job" "$recipe" "$toolstack" "$xenarch" "$dom0arch" "$@" || return 0 + xenbuildjob="${xenbfi}build-$xenarch$xsm_suffix" buildjob="${xenbfi}build-$dom0arch$xsm_suffix" tsbuildjob= -- 1.7.10.4