From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 03/12] Makefile: remove $(TESTS_PYTHON)
Date: Fri, 26 May 2023 18:08:15 +0200 [thread overview]
Message-ID: <20230526160824.655279-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com>
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>
---
tests/Makefile.include | 8 +++-----
tests/vm/Makefile.include | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 5b838ec438b0..0184ef223737 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -89,11 +89,9 @@ distclean-tcg: $(DISTCLEAN_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)/pyvenv
TESTS_VENV_TOKEN=$(BUILD_DIR)/pyvenv/tests.group
TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
-TESTS_PYTHON=$(TESTS_VENV_DIR)/bin/python3
ifndef AVOCADO_TESTS
AVOCADO_TESTS=tests/avocado
endif
@@ -109,7 +107,7 @@ else
endif
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")
$(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
get-vm-image-fedora-31-%: check-venv
$(call quiet-command, \
- $(TESTS_PYTHON) -m avocado vmimage get \
+ $(PYTHON) -m avocado vmimage get \
--distro=fedora --distro-version=31 --arch=$*, \
"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
$(call quiet-command, \
- $(TESTS_PYTHON) -m avocado \
+ $(PYTHON) -m avocado \
--show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
$(if $(AVOCADO_TAGS),, \
--filter-by-tags-include-empty \
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index c2a8ca1c175a..f0f5d32fb0f0 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -5,7 +5,7 @@ ifeq ($(realpath $(SRC_PATH)),$(realpath .))
VM_PYTHON = PYTHONPATH=$(SRC_PATH)/python /usr/bin/env python3
VM_VENV =
else
-VM_PYTHON = $(TESTS_PYTHON)
+VM_PYTHON = $(PYTHON)
VM_VENV = check-venv
endif
--
2.40.1
next prev parent reply other threads:[~2023-05-26 16:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 16:08 [PULL 00/12] (Mostly) build system patches for 2023-05-26 Paolo Bonzini
2023-05-26 16:08 ` [PULL 01/12] tests/docker: simplify HOST_ARCH definition Paolo Bonzini
2023-05-26 16:08 ` [PULL 02/12] tests/vm: fix and " Paolo Bonzini
2023-05-26 16:08 ` Paolo Bonzini [this message]
2023-05-26 16:08 ` [PULL 04/12] configure: unset harmful environment variables Paolo Bonzini
2023-05-27 15:57 ` Michael Tokarev
2023-05-28 18:11 ` Juan Quintela
2023-05-26 16:08 ` [PULL 05/12] meson: Remove leftover comment Paolo Bonzini
2023-05-26 16:08 ` [PULL 06/12] meson: Add static glib dependency for initrd-stress.img Paolo Bonzini
2023-05-26 16:08 ` [PULL 07/12] slirp: update wrap to latest master Paolo Bonzini
2023-05-26 16:08 ` [PULL 08/12] virtio: qmp: fix memory leak Paolo Bonzini
2023-05-27 9:30 ` Michael Tokarev
2023-05-26 16:08 ` [PULL 09/12] meson: simplify logic for -Dfdt Paolo Bonzini
2023-05-26 16:08 ` [PULL 10/12] meson: use subproject for internal libfdt Paolo Bonzini
2023-05-26 16:08 ` [PULL 11/12] meson: use subproject for keycodemapdb Paolo Bonzini
2023-05-26 16:08 ` [PULL 12/12] configure: ignore --make Paolo Bonzini
2023-05-27 0:16 ` [PULL 00/12] (Mostly) build system patches for 2023-05-26 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230526160824.655279-4-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).