From patchwork Fri Oct 11 17:29:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ryan S. Arnold" X-Patchwork-Id: 20977 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 126AD25EA1 for ; Fri, 11 Oct 2013 17:29:53 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id rq2sf8238561pbb.7 for ; Fri, 11 Oct 2013 10:29:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=r3BRSoV+xTfHk4hWFieHTZGA4+hVvjPpLp7rZsNnyuU=; b=kwZrFGgZ6Rvle/IcOGjhN96mrkP6Cv2wg9oDA5p7yPE+NffyJhDtSNvq/ufgKvb4V8 mkNpi1Lj7bX3wD4V907BAyoQcTo7h7DfGL3/+NuRSVnR9b9Zr/gSEL+3nfR3PqdlqStF 0wDPWnCyXQzi1o/79iL497GZ7ORSI9B9QJRmk/JpVGH8yje56a4aAvCbZN2lzzp+qLKI qNybys3GHDFf/4rq0njq5YhPhaH3Un8DSR6bkyvp7joj2N0czvZESUbPIjfxZJW88yeh eDNmI51jyPi6vkTZAugw0KvmMC0lVxWI1Lpykz0Fvyg7h3Prk1gK+w3eFEtEOucvY1an uHjw== X-Received: by 10.66.235.36 with SMTP id uj4mr7910371pac.9.1381512593398; Fri, 11 Oct 2013 10:29:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.12.176 with SMTP id z16ls529240qeb.16.gmail; Fri, 11 Oct 2013 10:29:53 -0700 (PDT) X-Received: by 10.221.47.193 with SMTP id ut1mr22178853vcb.8.1381512593242; Fri, 11 Oct 2013 10:29:53 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id bb4si9712430vcb.0.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:29:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ia6so2018197vcb.6 for ; Fri, 11 Oct 2013 10:29:53 -0700 (PDT) X-Gm-Message-State: ALoCoQmfWtN//jf4AYPCQ9V7ZtaGIN/Vmd+twYJa91DW7Dq9vvCkwG8cXbKES7CTDZnTzB35KjaF X-Received: by 10.220.75.73 with SMTP id x9mr1239316vcj.38.1381512593169; Fri, 11 Oct 2013 10:29:53 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp57129vcz; Fri, 11 Oct 2013 10:29:52 -0700 (PDT) X-Received: by 10.182.142.2 with SMTP id rs2mr1364945obb.60.1381512592532; Fri, 11 Oct 2013 10:29:52 -0700 (PDT) Received: from mail-ob0-f180.google.com (mail-ob0-f180.google.com [209.85.214.180]) by mx.google.com with ESMTPS id g1si32967994oej.28.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:29:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.180 is neither permitted nor denied by best guess record for domain of ryan.arnold@linaro.org) client-ip=209.85.214.180; Received: by mail-ob0-f180.google.com with SMTP id wn1so3021290obc.11 for ; Fri, 11 Oct 2013 10:29:52 -0700 (PDT) X-Received: by 10.182.84.132 with SMTP id z4mr2375241oby.49.1381512592283; Fri, 11 Oct 2013 10:29:52 -0700 (PDT) Received: from badwing.hsd1.mn.comcast.net. (c-71-195-40-9.hsd1.mn.comcast.net. [71.195.40.9]) by mx.google.com with ESMTPSA id rl1sm96711859oeb.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:29:51 -0700 (PDT) From: "Ryan S. Arnold" To: Rob Savoye Cc: patches@linaro.org, "Ryan S. Arnold" Subject: [PATCH][cbuild2 2/3] testsuite/test.sh: Remove redundant sourcing of host.conf. Date: Fri, 11 Oct 2013 12:29:30 -0500 Message-Id: <1381512571-13286-3-git-send-email-ryan.arnold@linaro.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1381512571-13286-1-git-send-email-ryan.arnold@linaro.org> References: <1381512571-13286-1-git-send-email-ryan.arnold@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ryan.arnold@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "Ryan S. Arnold" The code would attempt to source the host.conf file even if the previous step identified that there was no host.conf file in the working directory directory. --- testsuite/test.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testsuite/test.sh b/testsuite/test.sh index 4ba4bc5..4fea5c6 100755 --- a/testsuite/test.sh +++ b/testsuite/test.sh @@ -10,15 +10,14 @@ fi . "${topdir}/lib/common.sh" || exit 1 -# load the configure file produced by configure +# configure generates host.conf from host.conf.in. if test -e "${PWD}/host.conf"; then . "${PWD}/host.conf" else warning "no host.conf file!" + exit 1 fi -. "${topdir}/host.conf" || exit 1 - # Since we're testing, we don't load the host.conf file, instead # we create false values that stay consistent. cbuild_top=/build/cbuild2/test