From mboxrd@z Thu Jan  1 00:00:00 1970
From: Laurent Vivier <lvivier@redhat.com>
Subject: Re: [PATCH kvm-unit-tests v3 5/9] mkstandalone: provide errata to
 tests
Date: Tue, 13 Jun 2017 14:15:13 +0200
Message-ID: <8be0d4b5-abb2-a26b-d5a8-ff256ddd1d31@redhat.com>
References: <20170613115451.6240-1-drjones@redhat.com>
 <20170613115451.6240-6-drjones@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Cc: rkrcmar@redhat.com, pbonzini@redhat.com, thuth@redhat.com
To: Andrew Jones <drjones@redhat.com>, kvm@vger.kernel.org
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:41952 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752565AbdFMMPQ (ORCPT <rfc822;kvm@vger.kernel.org>);
        Tue, 13 Jun 2017 08:15:16 -0400
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
        (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
        (No client certificate requested)
        by mx1.redhat.com (Postfix) with ESMTPS id 0B7307CFA9
        for <kvm@vger.kernel.org>; Tue, 13 Jun 2017 12:15:16 +0000 (UTC)
In-Reply-To: <20170613115451.6240-6-drjones@redhat.com>
Content-Language: en-US
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On 13/06/2017 13:54, Andrew Jones wrote:
> Signed-off-by: Andrew Jones <drjones@redhat.com>

Reviewed-by: Laurent Vivier <lvivier@redhat.com>

> ---
>  configure               | 1 +
>  scripts/arch-run.bash   | 4 ++--
>  scripts/mkstandalone.sh | 6 ++++++
>  3 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index cde2cfe9db61..e1efb3ca0cca 100755
> --- a/configure
> +++ b/configure
> @@ -194,5 +194,6 @@ FIRMWARE=$firmware
>  ENDIAN=$endian
>  PRETTY_PRINT_STACKS=$pretty_print_stacks
>  ENVIRON_DEFAULT=$environ_default
> +ERRATATXT=errata.txt
>  U32_LONG_FMT=$u32_long
>  EOF
> diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
> index 27b8531fcfcf..7c6c79ad3a9d 100644
> --- a/scripts/arch-run.bash
> +++ b/scripts/arch-run.bash
> @@ -196,9 +196,9 @@ env_generate_errata ()
>  	kernel_sublevel=${kernel_sublevel%%[!0-9]*}
>  
>  	[ "$ENVIRON_DEFAULT" != "yes" ] && return
> -	[ ! -f errata.txt ] && return
> +	[ ! -f "$ERRATATXT" ] && return
>  
> -	for line in $(grep -v '^#' errata.txt | tr -d '[:blank:]' | cut -d: -f1,2); do
> +	for line in $(grep -v '^#' "$ERRATATXT" | tr -d '[:blank:]' | cut -d: -f1,2); do
>  		commit=${line%:*}
>  		minver=${line#*:}
>  
> diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
> index 55cfc4ef8c00..a15941f75375 100755
> --- a/scripts/mkstandalone.sh
> +++ b/scripts/mkstandalone.sh
> @@ -40,6 +40,7 @@ generate_test ()
>  
>  	echo "#!/usr/bin/env bash"
>  	echo "export STANDALONE=yes"
> +	echo "export ENVIRON_DEFAULT=yes"
>  	echo "export HOST=\$(uname -m | sed -e 's/i.86/i386/;s/arm.*/arm/;s/ppc64.*/ppc64/')"
>  	echo "export PRETTY_PRINT_STACKS=no"
>  
> @@ -62,6 +63,11 @@ generate_test ()
>  		echo 'export FIRMWARE'
>  	fi
>  
> +	if [ "$ERRATATXT" ]; then
> +		temp_file ERRATATXT "$ERRATATXT"
> +		echo 'export ERRATATXT'
> +	fi
> +
>  	temp_file bin "$kernel"
>  	args[3]='$bin'
>  
>