OSDN Git Service

Merge tag 'pull-target-arm-20231127' of https://git.linaro.org/people/pmaydell/qemu...
[qmiga/qemu.git] / tests / Makefile.include
index 6a1688e..c9d1674 100644 (file)
@@ -3,28 +3,28 @@
 .PHONY: check-help
 check-help:
        @echo "Regression testing targets:"
-       @echo " $(MAKE) check                Run block, qapi-schema, unit, softfloat, qtest and decodetree tests"
-       @echo " $(MAKE) bench                Run speed tests"
+       @echo " $(MAKE) check                  Run block, qapi-schema, unit, softfloat, qtest and decodetree tests"
+       @echo " $(MAKE) bench                  Run speed tests"
        @echo
        @echo "Individual test suites:"
-       @echo " $(MAKE) check-qtest-TARGET   Run qtest tests for given target"
-       @echo " $(MAKE) check-qtest          Run qtest tests"
-       @echo " $(MAKE) check-unit           Run qobject tests"
-       @echo " $(MAKE) check-qapi-schema    Run QAPI schema tests"
-       @echo " $(MAKE) check-block          Run block tests"
+       @echo " $(MAKE) check-qtest-TARGET     Run qtest tests for given target"
+       @echo " $(MAKE) check-qtest            Run qtest tests"
+       @echo " $(MAKE) check-unit             Run qobject tests"
+       @echo " $(MAKE) check-qapi-schema      Run QAPI schema tests"
+       @echo " $(MAKE) check-block            Run block tests"
 ifneq ($(filter $(all-check-targets), check-softfloat),)
-       @echo " $(MAKE) check-tcg            Run TCG tests"
-       @echo " $(MAKE) check-softfloat      Run FPU emulation tests"
+       @echo " $(MAKE) check-tcg              Run TCG tests"
+       @echo " $(MAKE) check-softfloat        Run FPU emulation tests"
 endif
-       @echo " $(MAKE) check-avocado        Run avocado (integration) tests for currently configured targets"
+       @echo " $(MAKE) check-avocado          Run avocado (integration) tests for currently configured targets"
        @echo
-       @echo " $(MAKE) check-report.tap     Generates an aggregated TAP test report"
-       @echo " $(MAKE) check-venv           Creates a Python venv for tests"
-       @echo " $(MAKE) check-clean          Clean the tests and related data"
+       @echo " $(MAKE) check-report.junit.xml Generates an aggregated XML test report"
+       @echo " $(MAKE) check-venv             Creates a Python venv for tests"
+       @echo " $(MAKE) check-clean            Clean the tests and related data"
        @echo
        @echo "The following are useful for CI builds"
-       @echo " $(MAKE) check-build          Build most test binaries"
-       @echo " $(MAKE) get-vm-images        Downloads all images used by avocado tests, according to configured targets (~350 MB each, 1.5 GB max)"
+       @echo " $(MAKE) check-build            Build most test binaries"
+       @echo " $(MAKE) get-vm-images          Downloads all images used by avocado tests, according to configured targets (~350 MB each, 1.5 GB max)"
        @echo
        @echo
        @echo "The variable SPEED can be set to control the gtester speed setting."
@@ -36,12 +36,10 @@ export SRC_PATH
 
 SPEED = quick
 
--include tests/tcg/Makefile.prereqs
-tests/tcg/Makefile.prereqs: config-host.mak
-
 # Per guest TCG tests
 BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TCG_TESTS_TARGETS))
 CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TCG_TESTS_TARGETS))
+DISTCLEAN_TCG_TARGET_RULES=$(patsubst %,distclean-tcg-tests-%, $(TCG_TESTS_TARGETS))
 RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TCG_TESTS_TARGETS))
 
 $(foreach TARGET,$(TCG_TESTS_TARGETS), \
@@ -50,35 +48,40 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \
 .PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%)
 $(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak
        $(call quiet-command, \
-            $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
-                        DOCKER_SCRIPT="$(DOCKER_SCRIPT)" \
-                        TARGET="$*" SRC_PATH="$(SRC_PATH)", \
+            $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS), \
         "BUILD","$* guest-tests")
 
 .PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%)
 $(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-%
        $(call quiet-command, \
-           $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
-                        TARGET="$*" SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run, \
+           $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) SPEED=$(SPEED) run, \
         "RUN", "$* guest-tests")
 
 .PHONY: $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%)
 $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%:
        $(call quiet-command, \
-           $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
-                        TARGET="$*" SRC_PATH="$(SRC_PATH)" clean, \
+           $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) clean, \
+        "CLEAN", "$* guest-tests")
+
+.PHONY: $(TCG_TESTS_TARGETS:%=distclean-tcg-tests-%)
+$(TCG_TESTS_TARGETS:%=distclean-tcg-tests-%): distclean-tcg-tests-%:
+       $(call quiet-command, \
+           $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) distclean, \
         "CLEAN", "$* guest-tests")
 
 .PHONY: build-tcg
 build-tcg: $(BUILD_TCG_TARGET_RULES)
 
 .PHONY: check-tcg
-.ninja-goals.check-tcg = all $(if $(CONFIG_PLUGIN),test-plugins)
+.ninja-goals.check-tcg = all test-plugins
 check-tcg: $(RUN_TCG_TARGET_RULES)
 
 .PHONY: clean-tcg
 clean-tcg: $(CLEAN_TCG_TARGET_RULES)
 
+.PHONY: distclean-tcg
+distclean-tcg: $(DISTCLEAN_TCG_TARGET_RULES)
+
 # Python venv for running tests
 
 .PHONY: check-venv check-avocado check-acceptance check-acceptance-deprecated-warning
@@ -86,8 +89,7 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES)
 # Build up our target list from the filtered list of ninja targets
 TARGETS=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targets)))
 
-TESTS_VENV_DIR=$(BUILD_DIR)/tests/venv
-TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
+TESTS_VENV_TOKEN=$(BUILD_DIR)/pyvenv/tests.group
 TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
 ifndef AVOCADO_TESTS
        AVOCADO_TESTS=tests/avocado
@@ -103,20 +105,20 @@ else
        AVOCADO_CMDLINE_TAGS=$(addprefix -t , $(AVOCADO_TAGS))
 endif
 
-$(TESTS_VENV_DIR): $(TESTS_VENV_REQ)
-       $(call quiet-command, \
-            $(PYTHON) -m venv $@, \
-            VENV, $@)
-       $(call quiet-command, \
-            $(TESTS_VENV_DIR)/bin/python -m pip -q install -r $(TESTS_VENV_REQ), \
-            PIP, $(TESTS_VENV_REQ))
+quiet-venv-pip = $(quiet-@)$(call quiet-command-run, \
+    $(PYTHON) -m pip -q --disable-pip-version-check $1, \
+    "VENVPIP","$1")
+
+$(TESTS_VENV_TOKEN): $(SRC_PATH)/pythondeps.toml
+       $(call quiet-venv-pip,install -e "$(SRC_PATH)/python/")
+       $(MKVENV_ENSUREGROUP) $< avocado
        $(call quiet-command, touch $@)
 
 $(TESTS_RESULTS_DIR):
        $(call quiet-command, mkdir -p $@, \
             MKDIR, $@)
 
-check-venv: $(TESTS_VENV_DIR)
+check-venv: $(TESTS_VENV_TOKEN)
 
 FEDORA_31_ARCHES_TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGETS)))
 FEDORA_31_ARCHES_CANDIDATES=$(patsubst ppc64,ppc64le,$(FEDORA_31_ARCHES_TARGETS))
@@ -126,7 +128,7 @@ FEDORA_31_DOWNLOAD=$(filter $(FEDORA_31_ARCHES),$(FEDORA_31_ARCHES_CANDIDATES))
 # download one specific Fedora 31 image
 get-vm-image-fedora-31-%: check-venv
        $(call quiet-command, \
-             $(TESTS_VENV_DIR)/bin/python -m avocado vmimage get \
+             $(PYTHON) -m avocado vmimage get \
              --distro=fedora --distro-version=31 --arch=$*, \
        "AVOCADO", "Downloading avocado tests VM image for $*")
 
@@ -135,7 +137,7 @@ get-vm-images: check-venv $(patsubst %,get-vm-image-fedora-31-%, $(FEDORA_31_DOW
 
 check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images
        $(call quiet-command, \
-            $(TESTS_VENV_DIR)/bin/python -m avocado \
+            $(PYTHON) -m avocado \
             --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
             $(if $(AVOCADO_TAGS),, --filter-by-tags-include-empty \
                        --filter-by-tags-include-empty-key) \
@@ -158,8 +160,9 @@ check:
 check-build: run-ninja
 
 check-clean:
-       rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
+       rm -rf $(TESTS_RESULTS_DIR)
 
 clean: check-clean clean-tcg
+distclean: distclean-tcg
 
 endif