From patchwork Thu May 15 22:26:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 349374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3C1D11400CF for ; Fri, 16 May 2014 08:27:20 +1000 (EST) Received: from localhost ([::1]:60771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wl47R-0002OF-Re for incoming@patchwork.ozlabs.org; Thu, 15 May 2014 18:27:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wl46n-00017a-Ii for qemu-devel@nongnu.org; Thu, 15 May 2014 18:26:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wl46h-0004pJ-Ee for qemu-devel@nongnu.org; Thu, 15 May 2014 18:26:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18729) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wl46h-0004pF-6N for qemu-devel@nongnu.org; Thu, 15 May 2014 18:26:31 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4FMQToV013673 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 May 2014 18:26:29 -0400 Received: from localhost (ovpn-116-20.ams2.redhat.com [10.36.116.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4FMQR8G019016 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Thu, 15 May 2014 18:26:28 -0400 From: Max Reitz To: qemu-devel@nongnu.org Date: Fri, 16 May 2014 00:26:11 +0200 Message-Id: <1400192774-606-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1400192774-606-1-git-send-email-mreitz@redhat.com> References: <1400192774-606-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Peter Maydell , Markus Armbruster , Max Reitz , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 4/7] iotests: Source common.env X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Source common.env in the iotests' check script. If the one supposed to be created by configure cannot be found, use common.env.default from the source tree. Signed-off-by: Max Reitz --- tests/qemu-iotests/check | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index a8d9569..bd66630 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -89,6 +89,23 @@ then fi fi +# we need common.env +if [ -n "$build_iotests" ] +then + configured_common_env="$build_iotests/common.env" +else + configured_common_env="$source_iotests/common.env" +fi + +if ! . "$configured_common_env" +then + if ! . "$source_iotests/common.env.default" + then + echo "$iam: failed to source common.env" + exit 1 + fi +fi + # we need common.config if ! . "$source_iotests/common.config" then