motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 00:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/docker: allow user to override check target

Browse source 
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: <20221117172532.538149-4-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2022-11-17 17:25:22 +00:00
parent a4b14b46d9
commit e558220df0
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/docker/Makefile.include
View file

@ -184,6 +184,7 @@ docker:
@echo ' TARGET_LIST=a,b,c Override target list in builds.' @echo ' TARGET_LIST=a,b,c Override target list in builds.'
@echo ' EXTRA_CONFIGURE_OPTS="..."' @echo ' EXTRA_CONFIGURE_OPTS="..."'
@echo ' Extra configure options.' @echo ' Extra configure options.'
@echo ' TEST_COMMAND="..." Override the default `make check` target.'
@echo ' IMAGES="a b c ..": Restrict available images to subset.' @echo ' IMAGES="a b c ..": Restrict available images to subset.'
@echo ' TESTS="x y z .." Restrict available tests to subset.' @echo ' TESTS="x y z .." Restrict available tests to subset.'
@echo ' J=[0..9]* Overrides the -jN parameter for make commands' @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) \ $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \
-e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \
-e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \ -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \
-e TEST_COMMAND="$(TEST_COMMAND)" \
-e V=$V -e J=$J -e DEBUG=$(DEBUG) \ -e V=$V -e J=$J -e DEBUG=$(DEBUG) \
-e SHOW_ENV=$(SHOW_ENV) \ -e SHOW_ENV=$(SHOW_ENV) \
$(if $(NOUSER),, \ $(if $(NOUSER),, \

6
tests/docker/common.rc
View file

@ -63,12 +63,12 @@ check_qemu()
{ {
# default to make check unless the caller specifies # default to make check unless the caller specifies
if [ $# = 0 ]; then if [ $# = 0 ]; then
INVOCATION="check" INVOCATION="${TEST_COMMAND:-make $MAKEFLAGS check}"
else else
INVOCATION="$@" INVOCATION="make $MAKEFLAGS $@"
fi fi
make $MAKEFLAGS $INVOCATION $INVOCATION
} }
test_fail() test_fail()