From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 27/33] make-flight: Run job_create_test_filter_callback on true job name Date: Thu, 17 Sep 2015 18:37:54 +0100 Message-ID: <1442511480-32587-28-git-send-email-ian.jackson@eu.citrix.com> References: <1442511480-32587-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcd8U-0006Vn-V1 for xen-devel@lists.xenproject.org; Thu, 17 Sep 2015 17:38:19 +0000 In-Reply-To: <1442511480-32587-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 Acked-by: Ian Campbell --- 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