[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/7] iotests: Source common.env
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 4/7] iotests: Source common.env |
Date: |
Fri, 16 May 2014 00:26:11 +0200 |
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 <address@hidden>
---
tests/qemu-iotests/check | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index a8d9569..bd66630 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -89,6 +89,23 @@ 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
+ echo "$iam: failed to source common.env"
+ exit 1
+ fi
+fi
+
# we need common.config
if ! . "$source_iotests/common.config"
then
--
1.9.2
- [Qemu-devel] [PATCH 0/7] iotests: Allow out-of-tree run, Max Reitz, 2014/05/15
- [Qemu-devel] [PATCH 1/7] iotests: Allow out-of-tree run, Max Reitz, 2014/05/15
- [Qemu-devel] [PATCH 2/7] configure: Enable out-of-tree iotests, Max Reitz, 2014/05/15
- [Qemu-devel] [PATCH 4/7] iotests: Source common.env,
Max Reitz <=
- [Qemu-devel] [PATCH 5/7] iotests: Use $PYTHON for Python scripts, Max Reitz, 2014/05/15
- [Qemu-devel] [PATCH 3/7] iotests: Add default common.env, Max Reitz, 2014/05/15
- [Qemu-devel] [PATCH 6/7] iotests: Drop Python version from 065's Shebang, Max Reitz, 2014/05/15
- [Qemu-devel] [PATCH 7/7] iotests: Fix 083 for out-of-tree builds, Max Reitz, 2014/05/15
- Re: [Qemu-devel] [PATCH 0/7] iotests: Allow out-of-tree run, Fam Zheng, 2014/05/16