[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 03/13] tests/docker: allow user to override check target
From: |
Alex Bennée |
Subject: |
[PATCH v3 03/13] tests/docker: allow user to override check target |
Date: |
Thu, 17 Nov 2022 17:25:22 +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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221111145529.4020801-5-alex.bennee@linaro.org>
---
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
- Re: [PATCH v3 05/13] docs/devel: make language a little less code centric, (continued)
- [PATCH v3 04/13] docs/devel: add a maintainers section to development process, Alex Bennée, 2022/11/17
- [PATCH v3 09/13] tests/avocado: introduce alpine virt test for CI, Alex Bennée, 2022/11/17
- [PATCH v3 07/13] docs/devel: try and improve the language around patch review, Alex Bennée, 2022/11/17
- [PATCH v3 06/13] docs/devel: simplify the minimal checklist, Alex Bennée, 2022/11/17
- [PATCH v3 08/13] tests/avocado: Raise timeout for boot_linux.py:BootLinuxPPC64.test_pseries_tcg, Alex Bennée, 2022/11/17
- [PATCH v3 03/13] tests/docker: allow user to override check target,
Alex Bennée <=
- [PATCH v3 13/13] ci: replace x86_64 macos-11 with aarch64 macos-12, Alex Bennée, 2022/11/17
- [PATCH v3 10/13] tests/avocado: skip aarch64 cloud TCG tests in CI, Alex Bennée, 2022/11/17
- [PATCH v3 12/13] tests/avocado/boot_linux.py: Bump aarch64 virt test timeout to 720s, Alex Bennée, 2022/11/17
- [PATCH v3 11/13] gitlab: integrate coverage report, Alex Bennée, 2022/11/17