Re: [PATCH v3 17/33] tests/tcg: clean-up some comments after the de-tangling

[Philippe Mathieu-Daudé]

On 9/24/19 11:00 PM, Alex Bennée wrote:
> These were missed in the recent de-tangling so have been updated to be
> more actuate. I've also built up ARM_TESTS in a manner similar to
> AARCH64_TESTS for better consistency.
> 
> Signed-off-by: Alex Bennée <address@hidden>
> Reviewed-by: Peter Maydell <address@hidden>
> ---
>  tests/tcg/Makefile.target         |  7 +++++--
>  tests/tcg/aarch64/Makefile.target |  3 ++-
>  tests/tcg/arm/Makefile.target     | 15 ++++++++-------
>  3 files changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
> index 8808beaf74b..679eb56bd37 100644
> --- a/tests/tcg/Makefile.target
> +++ b/tests/tcg/Makefile.target
> @@ -74,8 +74,11 @@ TIMEOUT=15
>  endif
>  
>  ifdef CONFIG_USER_ONLY
> -# The order we include is important. We include multiarch, base arch
> -# and finally arch if it's not the same as base arch.
> +# The order we include is important. We include multiarch first and
> +# then the target. If there are common tests shared between
> +# sub-targets (e.g. ARM & AArch64) then it is up to
> +# $(TARGET_NAME)/Makefile.target to include the common parent
> +# architecture in its VPATH.
>  -include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target
>  -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target
>  
> diff --git a/tests/tcg/aarch64/Makefile.target 
> b/tests/tcg/aarch64/Makefile.target
> index e763dd9da37..9758f89f905 100644
> --- a/tests/tcg/aarch64/Makefile.target
> +++ b/tests/tcg/aarch64/Makefile.target
> @@ -8,7 +8,7 @@ VPATH                 += $(ARM_SRC)
>  AARCH64_SRC=$(SRC_PATH)/tests/tcg/aarch64
>  VPATH                += $(AARCH64_SRC)
>  
> -# we don't build any other ARM test
> +# Float-convert Tests
>  AARCH64_TESTS=fcvt
>  
>  fcvt: LDFLAGS+=-lm
> @@ -17,6 +17,7 @@ run-fcvt: fcvt
>       $(call run-test,$<,$(QEMU) $<, "$< on $(TARGET_NAME)")
>       $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref)
>  
> +# Pauth Tests
>  AARCH64_TESTS += pauth-1 pauth-2
>  run-pauth-%: QEMU_OPTS += -cpu max
>  
> diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target
> index aa4e4e3782c..7347d3d0adb 100644
> --- a/tests/tcg/arm/Makefile.target
> +++ b/tests/tcg/arm/Makefile.target
> @@ -8,25 +8,26 @@ ARM_SRC=$(SRC_PATH)/tests/tcg/arm
>  # Set search path for all sources
>  VPATH                += $(ARM_SRC)
>  
> -ARM_TESTS=hello-arm test-arm-iwmmxt
> -
> -TESTS += $(ARM_TESTS) fcvt
> -
> +# Basic Hello World
> +ARM_TESTS = hello-arm
>  hello-arm: CFLAGS+=-marm -ffreestanding
>  hello-arm: LDFLAGS+=-nostdlib
>  
> +# IWMXT floating point extensions
> +ARM_TESTS += test-arm-iwmmxt
>  test-arm-iwmmxt: CFLAGS+=-marm -march=iwmmxt -mabi=aapcs -mfpu=fpv4-sp-d16
>  test-arm-iwmmxt: test-arm-iwmmxt.S
>       $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
>  
> -ifeq ($(TARGET_NAME), arm)
> +# Float-convert Tests
> +ARM_TESTS += fcvt
>  fcvt: LDFLAGS+=-lm
>  # fcvt: CFLAGS+=-march=armv8.2-a+fp16 -mfpu=neon-fp-armv8
> -
>  run-fcvt: fcvt
>       $(call run-test,fcvt,$(QEMU) $<,"$< on $(TARGET_NAME)")
>       $(call diff-out,fcvt,$(ARM_SRC)/fcvt.ref)
> -endif
> +
> +TESTS += $(ARM_TESTS)
>  
>  # On ARM Linux only supports 4k pages
>  EXTRA_RUNS+=run-test-mmap-4096
> 

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
(via make run-tcg-tests-arm-softmmu)