Re: [PATCH v7 27/27] tests/tcg: Increase timeout for TCI

[Alex Bennée]

Richard Henderson <richard.henderson@linaro.org> writes:

> The longest test at the moment seems to be a (slower)
> aarch64 host, for which test-mmap takes 64 seconds.
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  configure                 | 3 +++
>  tests/tcg/Makefile.target | 6 ++++--
>  2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 90c0807347..69091ff8ba 100755
> --- a/configure
> +++ b/configure
> @@ -5846,6 +5846,9 @@ fi
>  if test "$optreset" = "yes" ; then
>    echo "HAVE_OPTRESET=y" >> $config_host_mak
>  fi
> +if test "$tcg" = "enabled" -a "$tcg_interpreter" = "true" ; then
> +  echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak
> +fi
>  if test "$fdatasync" = "yes" ; then
>    echo "CONFIG_FDATASYNC=y" >> $config_host_mak
>  fi
> diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
> index b29fae4630..63cf1b2573 100644
> --- a/tests/tcg/Makefile.target
> +++ b/tests/tcg/Makefile.target
> @@ -81,8 +81,10 @@ LDFLAGS=
>  QEMU_OPTS=
>  
>  
> -# If TCG debugging is enabled things are a lot slower
> -ifeq ($(CONFIG_DEBUG_TCG),y)
> +# If TCG debugging, or TCI is enabled things are a lot slower
> +ifneq ($(CONFIG_TCG_INTERPRETER),)
> +TIMEOUT=90
> +else ifneq ($(CONFIG_DEBUG_TCG),)
>  TIMEOUT=60
>  else
>  TIMEOUT=15

Acked-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée