[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/12] tests/docker: allow user to override check target
From: |
Alex Bennée |
Subject: |
[PATCH v2 04/12] tests/docker: allow user to override check target |
Date: |
Fri, 11 Nov 2022 14:55:21 +0000 |
This is useful when trying to bisect a particular failing test behind
a docker run. For example:
make docker-test-clang@fedora \
TARGET_LIST=arm-softmmu \
TEST_COMMAND="meson test qtest-arm/qos-test" \
J=9 V=1
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
v1
- fix s/target /target./
- CHECK_TARGET -> TEST_COMMAND
---
tests/docker/Makefile.include | 2 ++
tests/docker/common.rc | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index c87f14477a..fc7a3b7e71 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -184,6 +184,7 @@ docker:
@echo ' TARGET_LIST=a,b,c Override target list in builds.'
@echo ' EXTRA_CONFIGURE_OPTS="..."'
@echo ' Extra configure options.'
+ @echo ' TEST_COMMAND="..." Override the default `make check`
target.'
@echo ' IMAGES="a b c ..": Restrict available images to subset.'
@echo ' TESTS="x y z .." Restrict available tests to subset.'
@echo ' J=[0..9]* Overrides the -jN parameter for make
commands'
@@ -230,6 +231,7 @@ docker-run: docker-qemu-src
$(if $(NETWORK),$(if $(subst
$(NETWORK),,1),--net=$(NETWORK)),--net=none) \
-e TARGET_LIST=$(subst
$(SPACE),$(COMMA),$(TARGET_LIST)) \
-e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \
+ -e TEST_COMMAND="$(TEST_COMMAND)" \
-e V=$V -e J=$J -e DEBUG=$(DEBUG) \
-e SHOW_ENV=$(SHOW_ENV) \
$(if $(NOUSER),, \
diff --git a/tests/docker/common.rc b/tests/docker/common.rc
index e6f8cee0d6..9a33df2832 100755
--- a/tests/docker/common.rc
+++ b/tests/docker/common.rc
@@ -63,12 +63,12 @@ check_qemu()
{
# default to make check unless the caller specifies
if [ $# = 0 ]; then
- INVOCATION="check"
+ INVOCATION="${TEST_COMMAND:-make $MAKEFLAGS check}"
else
- INVOCATION="$@"
+ INVOCATION="make $MAKEFLAGS $@"
fi
- make $MAKEFLAGS $INVOCATION
+ $INVOCATION
}
test_fail()
--
2.34.1
- [PATCH for 7.2-rc1 v2 00/12] testing, docs, plugins, arm pre-PR, Alex Bennée, 2022/11/11
- [PATCH v2 04/12] tests/docker: allow user to override check target,
Alex Bennée <=
- [PATCH v2 05/12] docs/devel: add a maintainers section to development process, Alex Bennée, 2022/11/11
- [PATCH v2 10/12] tests/avocado: Raise timeout for boot_linux.py:BootLinuxPPC64.test_pseries_tcg, Alex Bennée, 2022/11/11
- [PATCH v2 12/12] hw/intc: add implementation of GICD_IIDR to Arm GIC, Alex Bennée, 2022/11/11
- [PATCH v2 11/12] gitlab: integrate coverage report, Alex Bennée, 2022/11/11
- [PATCH v2 01/12] Run docker probe only if docker or podman are available, Alex Bennée, 2022/11/11
- [PATCH v2 02/12] tests/avocado: improve behaviour waiting for login prompts, Alex Bennée, 2022/11/11