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 <js...@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
