From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42641)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1Wmqa8-0001Nd-7V
	for qemu-devel@nongnu.org; Tue, 20 May 2014 16:24:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1Wmqa1-0006LE-KR
	for qemu-devel@nongnu.org; Tue, 20 May 2014 16:24:16 -0400
Received: from mx1.redhat.com ([209.132.183.28]:1452)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1Wmqa1-0006LA-Co
	for qemu-devel@nongnu.org; Tue, 20 May 2014 16:24:09 -0400
From: Max Reitz <mreitz@redhat.com>
Date: Tue, 20 May 2014 22:23:42 +0200
Message-Id: <1400617425-14942-5-git-send-email-mreitz@redhat.com>
In-Reply-To: <1400617425-14942-1-git-send-email-mreitz@redhat.com>
References: <1400617425-14942-1-git-send-email-mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v2 4/7] iotests: Source common.env
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Fam Zheng <famz@redhat.com>, Markus Armbruster <armbru@redhat.com>, Max Reitz <mreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>

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 <mreitz@redhat.com>
---
 tests/qemu-iotests/check | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index aa30ce5..f7f6cb3 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -100,6 +100,22 @@ 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
+        _init_error "failed to source common.env"
+    fi
+fi
+
 # we need common.config
 if ! . "$source_iotests/common.config"
 then
-- 
1.9.2