tests: add quiet-venv-pip macro
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>
This commit is contained in:
parent
a547c82701
commit
5a6f1199cb
@ -104,13 +104,13 @@ else
|
|||||||
AVOCADO_CMDLINE_TAGS=$(addprefix -t , $(AVOCADO_TAGS))
|
AVOCADO_CMDLINE_TAGS=$(addprefix -t , $(AVOCADO_TAGS))
|
||||||
endif
|
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)
|
$(TESTS_VENV_DIR): $(TESTS_VENV_REQ)
|
||||||
$(call quiet-command, \
|
$(call quiet-command, $(PYTHON) -m venv $@, VENV, $@)
|
||||||
$(PYTHON) -m venv $@, \
|
$(call quiet-venv-pip,install -r $(TESTS_VENV_REQ))
|
||||||
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, touch $@)
|
$(call quiet-command, touch $@)
|
||||||
|
|
||||||
$(TESTS_RESULTS_DIR):
|
$(TESTS_RESULTS_DIR):
|
||||||
|
Loading…
Reference in New Issue
Block a user