From: Max Reitz <mreitz@redhat.com>
Date: Sat, 24 May 2014 21:24:57 +0000 (+0200)
Subject: iotests: Source common.env
X-Git-Tag: qemu-xen-4.6.0-rc1~345^2~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7fed1a49ff72a5b794e3723612fa1731844b38f7;p=qemu-upstream-4.6-testing.git

iotests: Source common.env

Source common.env in the iotests' check script.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 69f328b57..992b91e14 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -103,6 +103,12 @@ then
     export QEMU_NBD_PROG="$build_root/qemu-nbd"
 fi
 
+# we need common.env
+if ! . "$build_iotests/common.env"
+then
+    _init_error "failed to source common.env (make sure the qemu-iotests are run from tests/qemu-iotests in the build tree)"
+fi
+
 # we need common.config
 if ! . "$source_iotests/common.config"
 then