[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/29] tests: add quiet-venv-pip macro
From: |
Paolo Bonzini |
Subject: |
[PULL 22/29] tests: add quiet-venv-pip macro |
Date: |
Mon, 6 Jun 2022 16:36:37 +0200 |
From: John Snow <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>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220526000921.1581503-6-jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/Makefile.include | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index ba9f5bd65c..fa46c0c61b 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.36.1
- [PULL 04/29] modules: introduces module_kconfig directive, (continued)
- [PULL 04/29] modules: introduces module_kconfig directive, Paolo Bonzini, 2022/06/06
- [PULL 09/29] replay: simplify async event processing, Paolo Bonzini, 2022/06/06
- [PULL 17/29] x86: cpu: fixup number of addressable IDs for logical processors sharing cache, Paolo Bonzini, 2022/06/06
- [PULL 18/29] python: update for mypy 0.950, Paolo Bonzini, 2022/06/06
- [PULL 01/29] target/i386/tcg: Fix masking of real-mode addresses with A20 bit, Paolo Bonzini, 2022/06/06
- [PULL 08/29] replay: rewrite async event handling, Paolo Bonzini, 2022/06/06
- [PULL 15/29] tests/Makefile.include: Fix 'make check-help' output, Paolo Bonzini, 2022/06/06
- [PULL 20/29] tests: use python3 as the python executable name, Paolo Bonzini, 2022/06/06
- [PULL 19/29] tests: add "TESTS_PYTHON" variable to Makefile, Paolo Bonzini, 2022/06/06
- [PULL 11/29] docs: move replay docs to docs/system/replay.rst, Paolo Bonzini, 2022/06/06
- [PULL 22/29] tests: add quiet-venv-pip macro,
Paolo Bonzini <=
- [PULL 23/29] tests: install "qemu" namespace package into venv, Paolo Bonzini, 2022/06/06
- [PULL 24/29] tests: use tests/venv to run basevm.py-based scripts, Paolo Bonzini, 2022/06/06
- [PULL 26/29] tests: run 'device-crash-test' from tests/venv, Paolo Bonzini, 2022/06/06
- [PULL 21/29] tests: silence pip upgrade warnings during venv creation, Paolo Bonzini, 2022/06/06
- [PULL 16/29] x86: cpu: make sure number of addressable IDs for processor cores meets the spec, Paolo Bonzini, 2022/06/06
- [PULL 25/29] tests: add python3-venv to debian10.docker, Paolo Bonzini, 2022/06/06
- [PULL 28/29] configure: remove reference to removed option, Paolo Bonzini, 2022/06/06
- [PULL 27/29] regenerate meson-buildoptions.sh, Paolo Bonzini, 2022/06/06
- [PULL 29/29] meson: qga: do not use deprecated meson.build_root(), Paolo Bonzini, 2022/06/06
- [PULL 12/29] tests/avocado: update replay_linux test, Paolo Bonzini, 2022/06/06