ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile: remove $(TESTS_PYTHON) 

It is now the same as $(PYTHON), since the latter always points at pyvenv/bin/python3.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-05-25 11:56:13 +02:00
parent b1399b0c85
commit eea2d14117
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Makefile.include
View File

@ -89,11 +89,9 @@ distclean-tcg: $(DISTCLEAN_TCG_TARGET_RULES)
# Build up our target list from the filtered list of ninja targets # Build up our target list from the filtered list of ninja targets
TARGETS=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targets))) TARGETS=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targets)))
TESTS_VENV_DIR=$(BUILD_DIR)/pyvenv
TESTS_VENV_TOKEN=$(BUILD_DIR)/pyvenv/tests.group TESTS_VENV_TOKEN=$(BUILD_DIR)/pyvenv/tests.group
TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
TESTS_PYTHON=$(TESTS_VENV_DIR)/bin/python3
ifndef AVOCADO_TESTS ifndef AVOCADO_TESTS
AVOCADO_TESTS=tests/avocado AVOCADO_TESTS=tests/avocado
endif endif
@ -109,7 +107,7 @@ else
endif endif
quiet-venv-pip = $(quiet-@)$(call quiet-command-run, \ quiet-venv-pip = $(quiet-@)$(call quiet-command-run, \
$(TESTS_PYTHON) -m pip -q --disable-pip-version-check $1, \ $(PYTHON) -m pip -q --disable-pip-version-check $1, \
"VENVPIP","$1") "VENVPIP","$1")
$(TESTS_VENV_TOKEN): $(TESTS_VENV_REQ) $(TESTS_VENV_TOKEN): $(TESTS_VENV_REQ)
@ -131,7 +129,7 @@ FEDORA_31_DOWNLOAD=$(filter $(FEDORA_31_ARCHES),$(FEDORA_31_ARCHES_CANDIDATES))
# download one specific Fedora 31 image # download one specific Fedora 31 image
get-vm-image-fedora-31-%: check-venv get-vm-image-fedora-31-%: check-venv
$(call quiet-command, \ $(call quiet-command, \
$(TESTS_PYTHON) -m avocado vmimage get \ $(PYTHON) -m avocado vmimage get \
--distro=fedora --distro-version=31 --arch=$*, \ --distro=fedora --distro-version=31 --arch=$*, \
"AVOCADO", "Downloading avocado tests VM image for $*") "AVOCADO", "Downloading avocado tests VM image for $*")
@ -142,7 +140,7 @@ JOBS_OPTION=$(lastword -j1 $(filter-out -j, $(filter -j%,$(MAKEFLAGS))))
check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images
$(call quiet-command, \ $(call quiet-command, \
$(TESTS_PYTHON) -m avocado \ $(PYTHON) -m avocado \
--show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \ --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
$(if $(AVOCADO_TAGS),, \ $(if $(AVOCADO_TAGS),, \
--filter-by-tags-include-empty \ --filter-by-tags-include-empty \

2
tests/vm/Makefile.include
View File

@ -5,7 +5,7 @@ ifeq ($(realpath $(SRC_PATH)),$(realpath .))
VM_PYTHON = PYTHONPATH=$(SRC_PATH)/python /usr/bin/env python3 VM_PYTHON = PYTHONPATH=$(SRC_PATH)/python /usr/bin/env python3
VM_VENV = VM_VENV =
else else
VM_PYTHON = $(TESTS_PYTHON) VM_PYTHON = $(PYTHON)
VM_VENV = check-venv VM_VENV = check-venv
endif endif