From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Max Reitz 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> Subject: [Qemu-devel] [PATCH 4/7] iotests: Source common.env List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Markus Armbruster , Max Reitz , Stefan Hajnoczi 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 -- 1.9.2