From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Cleber Rosa" <crosa@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Daniel Berrange" <berrange@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>, "John Snow" <jsnow@redhat.com>
Subject: [PATCH 5/9] tests: add quiet-venv-pip macro
Date: Wed, 25 May 2022 20:09:17 -0400 [thread overview]
Message-ID: <20220526000921.1581503-6-jsnow@redhat.com> (raw)
In-Reply-To: <20220526000921.1581503-1-jsnow@redhat.com>
Factor out the "test venv pip" macro; rewrite the "check-venv" rule to
be a little more compact. Replace the "PIP" pseudo-command output with
"VENVPIP" to make it 1% more clear that we are talking about using pip
to install something into a venv.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/Makefile.include | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 839ffde876a..052d7f56e9a 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -104,13 +104,13 @@ else
AVOCADO_CMDLINE_TAGS=$(addprefix -t , $(AVOCADO_TAGS))
endif
+quiet-venv-pip = $(quiet-@)$(call quiet-command-run, \
+ $(TESTS_PYTHON) -m pip -q --disable-pip-version-check $1, \
+ "VENVPIP","$1")
+
$(TESTS_VENV_DIR): $(TESTS_VENV_REQ)
- $(call quiet-command, \
- $(PYTHON) -m venv $@, \
- VENV, $@)
- $(call quiet-command, \
- $(TESTS_PYTHON) -m pip -q --disable-pip-version-check install \
- -r $(TESTS_VENV_REQ), PIP, $(TESTS_VENV_REQ))
+ $(call quiet-command, $(PYTHON) -m venv $@, VENV, $@)
+ $(call quiet-venv-pip,install -r $(TESTS_VENV_REQ))
$(call quiet-command, touch $@)
$(TESTS_RESULTS_DIR):
--
2.34.1
next prev parent reply other threads:[~2022-05-26 0:12 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 0:09 [PATCH 0/9] tests, python: prepare to expand usage of test venv John Snow
2022-05-26 0:09 ` [PATCH 1/9] python: update for mypy 0.950 John Snow
2022-05-26 0:09 ` [PATCH 2/9] tests: add "TESTS_PYTHON" variable to Makefile John Snow
2022-05-26 0:09 ` [PATCH 3/9] tests: use python3 as the python executable name John Snow
2022-05-26 12:16 ` Paolo Bonzini
2022-05-26 0:09 ` [PATCH 4/9] tests: silence pip upgrade warnings during venv creation John Snow
2022-05-26 12:16 ` Paolo Bonzini
2022-05-26 0:09 ` John Snow [this message]
2022-05-26 12:15 ` [PATCH 5/9] tests: add quiet-venv-pip macro Paolo Bonzini
2022-05-26 14:17 ` John Snow
2022-05-26 19:54 ` Paolo Bonzini
2022-05-26 12:16 ` Paolo Bonzini
2022-05-26 0:09 ` [PATCH 6/9] tests: install "qemu" namespace package into venv John Snow
2022-05-26 12:15 ` Paolo Bonzini
2022-05-26 0:09 ` [PATCH 7/9] tests: use tests/venv to run basevm.py-based scripts John Snow
2022-05-26 0:09 ` [PATCH 8/9] tests: add python3-venv to debian10.docker John Snow
2022-05-26 12:14 ` Paolo Bonzini
2022-05-30 7:33 ` Thomas Huth
2022-05-31 18:28 ` John Snow
2022-06-01 7:29 ` Thomas Huth
2022-06-02 17:44 ` John Snow
2022-05-26 0:09 ` [PATCH 9/9] tests: run 'device-crash-test' from tests/venv John Snow
2022-05-26 12:14 ` Paolo Bonzini
2022-05-26 14:14 ` John Snow
2022-05-26 14:34 ` [PATCH 0/9] tests, python: prepare to expand usage of test venv John Snow
2022-06-01 10:06 ` Paolo Bonzini
2022-05-27 14:27 ` John Snow
2022-06-01 10:06 ` Paolo Bonzini
2022-06-02 17:43 ` John Snow
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=20220526000921.1581503-6-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=f4bug@amsat.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/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).