From patchwork Thu May 1 16:10:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 29523 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5A4B0203F3 for ; Thu, 1 May 2014 16:13:12 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf17700332iec.10 for ; Thu, 01 May 2014 09:13:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:from:to:date:in-reply-to :references:organization: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=LvSWxa72LS39KK8uQ4p21Bo+DmtEEgPbTmmrrwu9MWU=; b=NTX5PAydoO00h99K2rTGxMk8ZseG2aVFJjzlIrUqBFUDIt8s47dwTEHGShmLMc93mK lhin43rys2FhF8vkFczd63CBf/v7LmHdxbH2zaqebAKKHIQXfAMeLTFTwaXNQitBiNiw ENYs6G8PwCYobYsNUA2xBcwFJmxZfcUdiiD6S8FWQfZGKj6OJnM9DEWW/0ijjiL80VLY CDydSIBMkCso0pmTj8kLmDD/YqgYYnRbxNETa39ZWgzpe+iYnMP7BX+lAM3oGmXg4w8P sLEPQB5Vjk9rnvEvQ7yZ9FvBB4oH5LOTHQHIftQYmh2v/aNdKTGMkWb98yeb7Eqph5UM iWHA== X-Gm-Message-State: ALoCoQmWcZttkW4DKsSx0DeqFz5oXUxL//QPwG2COzcTOgJAY+0PtbcogI89rWdJ5pDgCbXNGfTW X-Received: by 10.42.211.15 with SMTP id gm15mr5363376icb.28.1398960791457; Thu, 01 May 2014 09:13:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.71 with SMTP id k65ls1110174qgf.88.gmail; Thu, 01 May 2014 09:13:11 -0700 (PDT) X-Received: by 10.58.74.38 with SMTP id q6mr9079390vev.7.1398960791276; Thu, 01 May 2014 09:13:11 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id oo7si6131714vcb.130.2014.05.01.09.13.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 May 2014 09:13:11 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id ib6so4094442vcb.19 for ; Thu, 01 May 2014 09:13:11 -0700 (PDT) X-Received: by 10.53.1.69 with SMTP id be5mr7644152vdd.27.1398960791199; Thu, 01 May 2014 09:13:11 -0700 (PDT) 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.221.72 with SMTP id ib8csp35627vcb; Thu, 1 May 2014 09:13:10 -0700 (PDT) X-Received: by 10.52.250.4 with SMTP id yy4mr422570vdc.56.1398960789848; Thu, 01 May 2014 09:13:09 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id kj3si6121493vdb.150.2014.05.01.09.13.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 01 May 2014 09:13:09 -0700 (PDT) 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 1WftZe-00074b-3M; Thu, 01 May 2014 16:11:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WftZc-00074T-8x for xen-devel@lists.xen.org; Thu, 01 May 2014 16:11:00 +0000 Received: from [193.109.254.147:50581] by server-3.bemta-14.messagelabs.com id 46/A8-22179-31272635; Thu, 01 May 2014 16:10:59 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1398960657!2138269!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22596 invoked from network); 1 May 2014 16:10:58 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 1 May 2014 16:10:58 -0000 X-IronPort-AV: E=Sophos;i="4.97,965,1389744000"; d="scan'208";a="125853445" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 01 May 2014 16:10:59 +0000 Received: from kazak.uk.xensource.com (10.80.2.80) by FTLPEX01CL02.citrite.net (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Thu, 1 May 2014 12:10:56 -0400 Message-ID: <1398960655.29636.1.camel@kazak.uk.xensource.com> From: Ian Campbell To: Ian Jackson Date: Thu, 1 May 2014 17:10:55 +0100 In-Reply-To: <21345.5799.851660.420159@mariner.uk.xensource.com> References: <1398676935-30784-1-git-send-email-ian.campbell@citrix.com> <21345.5799.851660.420159@mariner.uk.xensource.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.12.1-1 MIME-Version: 1.0 X-Originating-IP: [10.80.2.80] X-DLP: MIA2 Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [OSSTEST] standalone: print the path to the apache logs if we can't read them 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: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: On Wed, 2014-04-30 at 16:28 +0100, Ian Jackson wrote: > Ian Campbell writes ("[OSSTEST] standalone: print the path to the apache logs if we can't read them"): > > For cut-and-paste convenience. > > Acked-by: Ian Jackson > > > diff --git a/standalone b/standalone > > index 6b08995..800b4ec 100755 > > --- a/standalone > > +++ b/standalone > > @@ -79,7 +79,7 @@ while true ; do > > done > > > > if [ ! -r /var/log/apache2/access.log ] ; then > > - echo "WARNING: Cannot read apache logs. Some tests may fail" >&2 > > + echo "WARNING: Cannot read apache logs at /var/log/apache2/access.log. Some tests may fail" >&2 > > fi > > I guess at some point it would be nice if this honoured the log > location config option (WebspaceLog). Done. 8<------------------- >From 0359398f95935b227b6b536175a92b29c9743980 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Sun, 27 Apr 2014 10:11:43 +0100 Subject: [PATCH] standalone: Use WebspaceLog for apache log check Also print the result in the error message for cut-and-paste convenience. While there I noticed that run-test was setting OSSTEST_CONFIG twice. Signed-off-by: Ian Campbell --- v2: Use cri-getconfig:getconfig --- standalone | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/standalone b/standalone index 6b08995..f00a81e 100755 --- a/standalone +++ b/standalone @@ -78,8 +78,12 @@ while true ; do esac done -if [ ! -r /var/log/apache2/access.log ] ; then - echo "WARNING: Cannot read apache logs. Some tests may fail" >&2 +. cri-getconfig + +WebspaceLog=`OSSTEST_CONFIG=$config getconfig WebspaceLog` +echo $WebspaceLog +if [ ! -r "$WebspaceLog" ] ; then + echo "WARNING: Cannot read apache logs at $WebspaceLog. Some tests may fail" >&2 fi if ! ssh-add -l >/dev/null ] ; then @@ -222,7 +226,6 @@ case $op in OSSTEST_CONFIG=$config \ OSSTEST_FLIGHT=$flight \ - OSSTEST_CONFIG=$config \ OSSTEST_HOST_REUSE=$reuse \ OSSTEST_JOB=$job \ with_logging logs/$flight/$job.$ts.log ./$ts host=$host $@