From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37226)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1WlCkQ-0001iq-RW
	for qemu-devel@nongnu.org; Fri, 16 May 2014 03:40:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1WlCkK-0003Pp-MC
	for qemu-devel@nongnu.org; Fri, 16 May 2014 03:40:06 -0400
Received: from mx1.redhat.com ([209.132.183.28]:35277)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1WlCkK-0003Pj-FR
	for qemu-devel@nongnu.org; Fri, 16 May 2014 03:40:00 -0400
Date: Fri, 16 May 2014 15:40:08 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20140516074008.GD1941@T430.nay.redhat.com>
References: <1400192774-606-1-git-send-email-mreitz@redhat.com>
	<1400192774-606-5-git-send-email-mreitz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1400192774-606-5-git-send-email-mreitz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 4/7] iotests: Source common.env
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Max Reitz <mreitz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>, Markus Armbruster <armbru@redhat.com>

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.

Thanks,
Fam

> 
> Signed-off-by: Max Reitz <mreitz@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
> 
>