[Qemu-devel] [PATCH v3 4/7] iotests: Source common.env

[Max Reitz <mreitz@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 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