On 11/15/23 12:55, Alex Bennée wrote:
> Prepare for expanding the arm system tests by cleaning up the test
> directory.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/tcg/arm/Makefile.softmmu-target | 5 ++---
> tests/tcg/arm/{ => system}/test-armv6m-undef.S | 0
> tests/tcg/arm/{ => system}/test-armv6m-undef.ld | 0
> 3 files changed, 2 insertions(+), 3 deletions(-)
> rename tests/tcg/arm/{ => system}/test-armv6m-undef.S (100%)
> rename tests/tcg/arm/{ => system}/test-armv6m-undef.ld (100%)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
>
> diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile.softmmu-target
> index 8b546e2aa3..7857ab9324 100644
> --- a/tests/tcg/arm/Makefile.softmmu-target
> +++ b/tests/tcg/arm/Makefile.softmmu-target
> @@ -3,7 +3,7 @@
> # ARM SoftMMU tests - included from tests/tcg/Makefile
> #
>
> -ARM_SRC=$(SRC_PATH)/tests/tcg/arm
> +ARM_SRC=$(SRC_PATH)/tests/tcg/arm/system
>
> # Set search path for all sources
> VPATH += $(ARM_SRC)
> @@ -12,7 +12,6 @@ ARM_TESTS=test-armv6m-undef
>
> TESTS += $(ARM_TESTS)
>
> -CFLAGS+=-Wl,--build-id=none -x assembler-with-cpp
> LDFLAGS+=-nostdlib -N -static
>
> %: %.S %.ld
> @@ -20,7 +19,7 @@ LDFLAGS+=-nostdlib -N -static
>
> # Specific Test Rules
>
> -test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0 -mfloat-abi=soft
> +test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0 -mfloat-abi=soft -Wl,--build-id=none -x assembler-with-cpp
>
> run-test-armv6m-undef: QEMU_OPTS+=-semihosting -M microbit -kernel
>
> diff --git a/tests/tcg/arm/test-armv6m-undef.S b/tests/tcg/arm/system/test-armv6m-undef.S
> similarity index 100%
> rename from tests/tcg/arm/test-armv6m-undef.S
> rename to tests/tcg/arm/system/test-armv6m-undef.S
> diff --git a/tests/tcg/arm/test-armv6m-undef.ld b/tests/tcg/arm/system/test-armv6m-undef.ld
> similarity index 100%
> rename from tests/tcg/arm/test-armv6m-undef.ld
> rename to tests/tcg/arm/system/test-armv6m-undef.ld