* [PATCH] tests/tcg: use EXTRA_RUNS to run gdbtests
@ 2020-04-20 13:34 Alex Bennée
2020-04-21 8:01 ` Edgar E. Iglesias
2020-04-21 17:42 ` Richard Henderson
0 siblings, 2 replies; 3+ messages in thread
From: Alex Bennée @ 2020-04-20 13:34 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, open list:ARM TCG CPUs, richard.henderson,
Edgar E. Iglesias, Peter Maydell
With --enable-plugins the gdb tests confuse things somewhat as the
plugin code attempts to enumerate tests with non-existent binaries.
Fortunately we already have a mechanism for these extra tests that
don't automatically include their own binaries. Use that mechanism and
drop the unneeded .PHONY declarations.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/aarch64/Makefile.target | 5 ++---
tests/tcg/cris/Makefile.target | 1 +
tests/tcg/multiarch/Makefile.target | 5 ++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target
index d99b2a9eced..312f36cde5f 100644
--- a/tests/tcg/aarch64/Makefile.target
+++ b/tests/tcg/aarch64/Makefile.target
@@ -54,9 +54,6 @@ sve-ioctls: CFLAGS+=-march=armv8.1-a+sve
ifneq ($(HAVE_GDB_BIN),)
GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
-AARCH64_TESTS += gdbstub-sysregs gdbstub-sve-ioctls
-
-.PHONY: gdbstub-sysregs gdbstub-sve-ioctls
run-gdbstub-sysregs: sysregs
$(call run-test, $@, $(GDB_SCRIPT) \
--gdb $(HAVE_GDB_BIN) \
@@ -70,6 +67,8 @@ run-gdbstub-sve-ioctls: sve-ioctls
--qemu $(QEMU) --qargs "$(QEMU_OPTS)" \
--bin $< --test $(AARCH64_SRC)/gdbstub/test-sve-ioctl.py, \
"basic gdbstub SVE ZLEN support")
+
+EXTRA_RUNS += run-gdbstub-sysregs run-gdbstub-sve-ioctls
endif
endif
diff --git a/tests/tcg/cris/Makefile.target b/tests/tcg/cris/Makefile.target
index 24c7f2e7616..e72d3cbdb23 100644
--- a/tests/tcg/cris/Makefile.target
+++ b/tests/tcg/cris/Makefile.target
@@ -23,6 +23,7 @@ CRIS_RUNS = $(patsubst %, run-%, $(CRIS_USABLE_TESTS))
# override the list of tests, as we can't build the multiarch tests
TESTS = $(CRIS_USABLE_TESTS)
+EXTRA_RUNS =
VPATH = $(CRIS_SRC)
AS = $(CC) -x assembler-with-cpp
diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target
index 47fd675aba5..51fb75ecfdd 100644
--- a/tests/tcg/multiarch/Makefile.target
+++ b/tests/tcg/multiarch/Makefile.target
@@ -45,15 +45,14 @@ run-test-mmap-%: test-mmap
ifneq ($(HAVE_GDB_BIN),)
GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
-MULTIARCH_TESTS += gdbstub-sha1
-
-.PHONY: gdbstub-sha1
run-gdbstub-sha1: sha1
$(call run-test, $@, $(GDB_SCRIPT) \
--gdb $(HAVE_GDB_BIN) \
--qemu $(QEMU) --qargs "$(QEMU_OPTS)" \
--bin $< --test $(MULTIARCH_SRC)/gdbstub/sha1.py, \
"basic gdbstub support")
+
+EXTRA_RUNS += run-gdbstub-sha1
endif
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tests/tcg: use EXTRA_RUNS to run gdbtests
2020-04-20 13:34 [PATCH] tests/tcg: use EXTRA_RUNS to run gdbtests Alex Bennée
@ 2020-04-21 8:01 ` Edgar E. Iglesias
2020-04-21 17:42 ` Richard Henderson
1 sibling, 0 replies; 3+ messages in thread
From: Edgar E. Iglesias @ 2020-04-21 8:01 UTC (permalink / raw)
To: Alex Bennée
Cc: Peter Maydell, open list:ARM TCG CPUs, richard.henderson,
qemu-devel
On Mon, Apr 20, 2020 at 02:34:55PM +0100, Alex Bennée wrote:
> With --enable-plugins the gdb tests confuse things somewhat as the
> plugin code attempts to enumerate tests with non-existent binaries.
> Fortunately we already have a mechanism for these extra tests that
> don't automatically include their own binaries. Use that mechanism and
> drop the unneeded .PHONY declarations.
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/tcg/aarch64/Makefile.target | 5 ++---
> tests/tcg/cris/Makefile.target | 1 +
> tests/tcg/multiarch/Makefile.target | 5 ++---
> 3 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target
> index d99b2a9eced..312f36cde5f 100644
> --- a/tests/tcg/aarch64/Makefile.target
> +++ b/tests/tcg/aarch64/Makefile.target
> @@ -54,9 +54,6 @@ sve-ioctls: CFLAGS+=-march=armv8.1-a+sve
> ifneq ($(HAVE_GDB_BIN),)
> GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
>
> -AARCH64_TESTS += gdbstub-sysregs gdbstub-sve-ioctls
> -
> -.PHONY: gdbstub-sysregs gdbstub-sve-ioctls
> run-gdbstub-sysregs: sysregs
> $(call run-test, $@, $(GDB_SCRIPT) \
> --gdb $(HAVE_GDB_BIN) \
> @@ -70,6 +67,8 @@ run-gdbstub-sve-ioctls: sve-ioctls
> --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \
> --bin $< --test $(AARCH64_SRC)/gdbstub/test-sve-ioctl.py, \
> "basic gdbstub SVE ZLEN support")
> +
> +EXTRA_RUNS += run-gdbstub-sysregs run-gdbstub-sve-ioctls
> endif
>
> endif
> diff --git a/tests/tcg/cris/Makefile.target b/tests/tcg/cris/Makefile.target
> index 24c7f2e7616..e72d3cbdb23 100644
> --- a/tests/tcg/cris/Makefile.target
> +++ b/tests/tcg/cris/Makefile.target
> @@ -23,6 +23,7 @@ CRIS_RUNS = $(patsubst %, run-%, $(CRIS_USABLE_TESTS))
>
> # override the list of tests, as we can't build the multiarch tests
> TESTS = $(CRIS_USABLE_TESTS)
> +EXTRA_RUNS =
> VPATH = $(CRIS_SRC)
>
> AS = $(CC) -x assembler-with-cpp
> diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target
> index 47fd675aba5..51fb75ecfdd 100644
> --- a/tests/tcg/multiarch/Makefile.target
> +++ b/tests/tcg/multiarch/Makefile.target
> @@ -45,15 +45,14 @@ run-test-mmap-%: test-mmap
> ifneq ($(HAVE_GDB_BIN),)
> GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
>
> -MULTIARCH_TESTS += gdbstub-sha1
> -
> -.PHONY: gdbstub-sha1
> run-gdbstub-sha1: sha1
> $(call run-test, $@, $(GDB_SCRIPT) \
> --gdb $(HAVE_GDB_BIN) \
> --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \
> --bin $< --test $(MULTIARCH_SRC)/gdbstub/sha1.py, \
> "basic gdbstub support")
> +
> +EXTRA_RUNS += run-gdbstub-sha1
> endif
>
>
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tests/tcg: use EXTRA_RUNS to run gdbtests
2020-04-20 13:34 [PATCH] tests/tcg: use EXTRA_RUNS to run gdbtests Alex Bennée
2020-04-21 8:01 ` Edgar E. Iglesias
@ 2020-04-21 17:42 ` Richard Henderson
1 sibling, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2020-04-21 17:42 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Peter Maydell, open list:ARM TCG CPUs, Edgar E. Iglesias
On 4/20/20 6:34 AM, Alex Bennée wrote:
> With --enable-plugins the gdb tests confuse things somewhat as the
> plugin code attempts to enumerate tests with non-existent binaries.
> Fortunately we already have a mechanism for these extra tests that
> don't automatically include their own binaries. Use that mechanism and
> drop the unneeded .PHONY declarations.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/tcg/aarch64/Makefile.target | 5 ++---
> tests/tcg/cris/Makefile.target | 1 +
> tests/tcg/multiarch/Makefile.target | 5 ++---
> 3 files changed, 5 insertions(+), 6 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-21 17:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-20 13:34 [PATCH] tests/tcg: use EXTRA_RUNS to run gdbtests Alex Bennée
2020-04-21 8:01 ` Edgar E. Iglesias
2020-04-21 17:42 ` Richard Henderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).