|
From: | Max Reitz |
Subject: | Re: [Qemu-devel] [PATCH 4/7] iotests: Source common.env |
Date: | Fri, 16 May 2014 16:49:00 +0200 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 |
On 16.05.2014 09:40, Fam Zheng wrote:
On Fri, 05/16 00:26, 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.If configure is supposed to create common.env, but we can't find it here, isn't it a bug of configure? If so, I don't think we need common.env.default, we need an error.
In fact, I am getting an error. The first . "$configured_common_env" will print an error message, so the user should be informed of something going wrong.
You are right in that this should not happen. However, it may happen if the user decides to run the iotests from the source tree instead of the build tree if he/she is still used to the old way of invoking them. So I think, having a default common.env should solve this without creating new problems.
Max
Thanks, FamSigned-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
[Prev in Thread] | Current Thread | [Next in Thread] |