From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57037)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1WoIOX-0001ON-M4
	for qemu-devel@nongnu.org; Sat, 24 May 2014 16:18:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1WoIOR-00023P-H1
	for qemu-devel@nongnu.org; Sat, 24 May 2014 16:18:17 -0400
Received: from mx1.redhat.com ([209.132.183.28]:62412)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1WoIOR-00023E-8I
	for qemu-devel@nongnu.org; Sat, 24 May 2014 16:18:11 -0400
Message-ID: <5380FE7A.5050905@redhat.com>
Date: Sat, 24 May 2014 22:18:02 +0200
From: Max Reitz <mreitz@redhat.com>
MIME-Version: 1.0
References: <1400794231-27403-1-git-send-email-mreitz@redhat.com>
	<1400794231-27403-5-git-send-email-mreitz@redhat.com>
	<20140523040142.GE1668@T430.nay.redhat.com>
In-Reply-To: <20140523040142.GE1668@T430.nay.redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v3 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: Fam Zheng <famz@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 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 <mreitz@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
>>
>>