From patchwork Wed Nov 5 10:41:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 40182 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 400B824538 for ; Wed, 5 Nov 2014 10:49:20 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf694031eek.9 for ; Wed, 05 Nov 2014 02:49:19 -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 :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=jiuBzDDJY2Ovw2a45JRnD0H7LjyboeGndlVm0dJK99w=; b=TCDIEFDgyYTG6eQ+R7N/TT4gtW3Zos0WAeUY5uS05kCsn36FWzRAlEDs7Gvs0YoPTI YM55+Ivy1DYdIhcnphnqIqYfvzbUXL5sMDpfB99esQXrTluLW8Dqnvb2fo2C6piB8Vdo 3vlooCHtSc6xlM2E0vfqggPAUu2fBiOUpvj8OosTzZ61IJsMNqhvoI41ntrhSvS0bED5 ccbryKegqoyKr9aeJIEn0+u0MK5zRA1bidm90PxKyvYbnGlC8EA8T75TdVetKmxmtj9a wFHWiaoHvxobylbQ7mTfIU4Tl8lhmZqKhH8Ge7592zsLePaSy/Vi7+YsFfie/S7LFqDC gPkw== X-Gm-Message-State: ALoCoQl9c/5S9j7MwZl6FAbGdjP9U6NI7TLv09QB6lU7PPxy7iKz24TAzM2pF+yDYT3A2VnjlDeS X-Received: by 10.180.106.67 with SMTP id gs3mr485464wib.3.1415184559523; Wed, 05 Nov 2014 02:49:19 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.5 with SMTP id o5ls363829lao.3.gmail; Wed, 05 Nov 2014 02:49:19 -0800 (PST) X-Received: by 10.112.159.229 with SMTP id xf5mr65995016lbb.64.1415184559203; Wed, 05 Nov 2014 02:49:19 -0800 (PST) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id jo7si5532517lbc.39.2014.11.05.02.49.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Nov 2014 02:49:19 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id 10so411250lbg.0 for ; Wed, 05 Nov 2014 02:49:19 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr3774597laz.27.1415184559122; Wed, 05 Nov 2014 02:49:19 -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.112.184.201 with SMTP id ew9csp262753lbc; Wed, 5 Nov 2014 02:49:18 -0800 (PST) X-Received: by 10.140.104.65 with SMTP id z59mr38524369qge.75.1415184556013; Wed, 05 Nov 2014 02:49:16 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id u92si5690511qge.27.2014.11.05.02.49.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 05 Nov 2014 02:49:16 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) 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 1Xly7s-0002Wc-Tt; Wed, 05 Nov 2014 10:47:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xly7s-0002WQ-Cw for xen-devel@lists.xen.org; Wed, 05 Nov 2014 10:47:44 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 85/34-09936-F400A545; Wed, 05 Nov 2014 10:47:43 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1415184462!4887482!1 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.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25154 invoked from network); 5 Nov 2014 10:47:43 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2014 10:47:43 -0000 X-IronPort-AV: E=Sophos;i="5.07,319,1413244800"; d="scan'208";a="188258225" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Wed, 5 Nov 2014 05:47:41 -0500 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Xly1k-0003U2-Ad; Wed, 05 Nov 2014 10:41:25 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Wed, 05 Nov 2014 10:41:24 +0000 From: Ian Campbell To: Date: Wed, 5 Nov 2014 10:41:24 +0000 Message-ID: <1415184084-14650-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST] standalone: Handle multiple configuration files. 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) 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: OSSTEST_CONFIG can actually be a colon separate list of files, so take this into account when sanity checking it. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- standalone | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/standalone b/standalone index c1139f8..caf3fd5 100755 --- a/standalone +++ b/standalone @@ -112,10 +112,19 @@ if [ ! -f standalone.db ] ; then exit 1 fi -if [ -z "$config" -o ! -r "$config" ] ; then - echo "Cannot read config." >&2 +if [ -z "$config" ] ; then + echo "No config specified." >&2 exit 1 fi +IFS_saved=$IFS +IFS=: +for c in $config ; do + if [ -z "$c" -o ! -r "$c" ] ; then + echo "Cannot read config $c." >&2 + exit 1 + fi +done +IFS=$IFS_saved need_flight() { if [ -z "$flight" ] ; then