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 | 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