From patchwork Wed Jan 22 09:54:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 23491 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B9271218DC for ; Wed, 22 Jan 2014 10:31:17 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id e9sf296247qcy.3 for ; Wed, 22 Jan 2014 02:31:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=h3djnIlPN+vFePxRfdVAOumR1peEvMkbLEY8nu859AM=; b=Dx4SJ8AN2ttWhgqk+w/qCx8uEN/GGDgUSVxc1zjMVV07TmIEiliPaEOheEzzSD+sXC FOvs1B1pW6NtzoQc0tX+LgJDYVcK094qUpfZNM+sC+M9MFZmxYYIuNgt3omPSEvxlV2K gCmaSsgTYb+Me2pFGc/BTDxxncc30fpSP+5+5g/LqoVViqUH8fEyQIqFXB6AdLLyJOQL 5HxHnc3uMQWDG9ANlg0cjIxSm6AEtyt1sLFseb2Mg8OWZm/3N32/D9NXsHWJ31p1d8Yc hR3dOqdcTgCJMPGZSxxqyRvifs20VgyqUNYUwoAhN/Rym8qwhZVHDG0d6D4xp0foZNzd nQuQ== X-Gm-Message-State: ALoCoQl8A+W2coQJyUQ82WD6vLzXF46RzzRblzy7rYWlLj7hOoa1pi7iYIEvzaLhqEuF7LR0xt93 X-Received: by 10.236.73.164 with SMTP id v24mr246795yhd.24.1390386676958; Wed, 22 Jan 2014 02:31:16 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.17.65 with SMTP id m1ls43652qed.91.gmail; Wed, 22 Jan 2014 02:31:16 -0800 (PST) X-Received: by 10.221.26.10 with SMTP id rk10mr381786vcb.0.1390386676811; Wed, 22 Jan 2014 02:31:16 -0800 (PST) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by mx.google.com with ESMTPS id dc20si2728266vec.42.2014.01.22.02.31.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 02:31:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.47 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.47; Received: by mail-vb0-f47.google.com with SMTP id p6so102554vbe.6 for ; Wed, 22 Jan 2014 02:31:16 -0800 (PST) X-Received: by 10.58.181.165 with SMTP id dx5mr321843vec.19.1390386676618; Wed, 22 Jan 2014 02:31:16 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp175388vcz; Wed, 22 Jan 2014 02:31:16 -0800 (PST) X-Received: by 10.50.61.137 with SMTP id p9mr22913692igr.45.1390386675682; Wed, 22 Jan 2014 02:31:15 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id t15si13425145igr.21.2014.01.22.02.31.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 Jan 2014 02:31:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W5uWg-0006jY-I3; Wed, 22 Jan 2014 09:55:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W5uWe-0006d8-7D for xen-devel@lists.xen.org; Wed, 22 Jan 2014 09:55:12 +0000 Received: from [85.158.143.35:34277] by server-1.bemta-4.messagelabs.com id 25/49-02132-F759FD25; Wed, 22 Jan 2014 09:55:11 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1390384503!385!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25913 invoked from network); 22 Jan 2014 09:55:10 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 22 Jan 2014 09:55:10 -0000 X-IronPort-AV: E=Sophos;i="4.95,698,1384300800"; d="scan'208";a="95230010" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 22 Jan 2014 09:55:10 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.2.342.4; Wed, 22 Jan 2014 04:55:10 -0500 Received: from spare.cam.xci-test.com ([10.80.2.80] helo=kazak.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1W5uWU-0005Rs-HB; Wed, 22 Jan 2014 09:55:02 +0000 From: Ian Campbell To: Date: Wed, 22 Jan 2014 09:54:56 +0000 Message-ID: <1390384501-20552-12-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390384419.32519.32.camel@kazak.uk.xensource.com> References: <1390384419.32519.32.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST 12/17] make-flight: refactor test case filter over $branch X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.47 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Signed-off-by: Ian Campbell --- make-flight | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/make-flight b/make-flight index 8862be5..e1b65b2 100755 --- a/make-flight +++ b/make-flight @@ -76,10 +76,31 @@ job_create_test_filter_callback () { return 0; } +test_matrix_branch_filter_callback () { + case "$xenarch" in + armhf) + case "$branch" in + linux-arm-xen) ;; + linux-*) return 1;; + qemu-*) return 1;; + esac + ;; + i386|amd64) + case "$branch" in + linux-arm-xen) return 1;; + esac + ;; + esac + + return 0 +} + for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do if [ "x$xenarch" = xdisable ]; then continue; fi + test_matrix_branch_filter_callback || continue + case "$xenarch" in armhf) # Arm from 4.3 onwards only @@ -90,11 +111,6 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do xen-4.2-testing) continue;; *) ;; esac - case "$branch" in - linux-arm-xen) ;; - linux-*) continue;; - qemu-*) continue;; - esac ;; i386) # 32-bit Xen is dropped from 4.3 onwards @@ -105,14 +121,9 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do xen-4.2-testing) ;; *) continue ;; esac - case "$branch" in - linux-arm-xen) continue;; - esac ;; amd64) - case "$branch" in - linux-arm-xen) continue;; - esac + ;; esac case "$xenarch" in