On 23.05.2014 06:01, Fam Zheng wrote:
On Thu, 05/22 23:30, Max Reitz wrote:
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 <mre...@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" ]
$build_iotests is always set in patch 1, so you don't need this if.
Right, I forgot to update this in v3.
Thanks,
Max
Fam
+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
