Re: [Qemu-block] [Qemu-devel] [PATCH 05/12] qemu-iotests: do not include common.rc in "check"

[Philippe Mathieu-Daudé]

On 08/09/2017 06:55 PM, Paolo Bonzini wrote:
> It only provides functions used by the test programs.
>
> Signed-off-by: Paolo Bonzini <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>   tests/qemu-iotests/check     |  6 ------
>   tests/qemu-iotests/common.rc | 13 +++++--------
>   2 files changed, 5 insertions(+), 14 deletions(-)
>
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index 5075029e89..1ef6d0ac3a 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -113,12 +113,6 @@ then
>       _init_error "failed to source common.config"
>   fi
>   
> -# we need common.rc
> -if ! . "$source_iotests/common.rc"
> -then
> -    _init_error "failed to source common.rc"
> -fi
> -
>   # we need common
>   . "$source_iotests/common"
>   
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index ef5cdb3385..390aa81224 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -40,14 +40,11 @@ poke_file()
>       printf "$3" | dd "of=$1" bs=1 "seek=$2" conv=notrunc &>/dev/null
>   }
>   
> -# we need common.config
> -if [ "$iam" != "check" ]
> -then
> -    if ! . ./common.config
> -        then
> -        echo "$iam: failed to source common.config"
> -        exit 1
> -    fi
> +
> +if ! . ./common.config
> +    then
> +    echo "$iam: failed to source common.config"
> +    exit 1
>   fi
>   
>   _fatal()