From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnaZk-00041J-Lc for qemu-devel@nongnu.org; Thu, 22 May 2014 17:31:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnaZe-0006iQ-9x for qemu-devel@nongnu.org; Thu, 22 May 2014 17:30:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56442) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnaZe-0006iE-1q for qemu-devel@nongnu.org; Thu, 22 May 2014 17:30:50 -0400 From: Max Reitz Date: Thu, 22 May 2014 23:30:28 +0200 Message-Id: <1400794231-27403-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1400794231-27403-1-git-send-email-mreitz@redhat.com> References: <1400794231-27403-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 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 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index bd917a1..8ec5b8d 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -103,6 +103,22 @@ then export QEMU_NBD_PROG="$build_root/qemu-nbd" 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.3