From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCPk7-0007XD-6e for qemu-devel@nongnu.org; Tue, 16 Oct 2018 09:50:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCPk5-0003IG-W5 for qemu-devel@nongnu.org; Tue, 16 Oct 2018 09:50:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31476) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gCPk5-0003GS-JU for qemu-devel@nongnu.org; Tue, 16 Oct 2018 09:50:37 -0400 References: <20181012165347.2117-1-crosa@redhat.com> <20181012165347.2117-2-crosa@redhat.com> <94f7da55-eaa1-6e63-333c-894831b9d66e@redhat.com> <20181013033747.GC31060@habkost.net> From: Cleber Rosa Message-ID: Date: Tue, 16 Oct 2018 09:50:18 -0400 MIME-Version: 1.0 In-Reply-To: <20181013033747.GC31060@habkost.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 1/3] Bootstrap Python venv for tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Cc: Fam Zheng , Laszlo Ersek , Caio Carrara , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org, =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Stefan Hajnoczi , =?UTF-8?Q?Alex_Benn=c3=a9e?= On 10/12/18 11:37 PM, Eduardo Habkost wrote: > On Fri, Oct 12, 2018 at 11:30:39PM +0200, Philippe Mathieu-Daud=C3=A9 w= rote: >> Hi Cleber, >> >> On 12/10/2018 18:53, Cleber Rosa wrote: >>> A number of QEMU tests are written in Python, and may benefit >>> from an untainted Python venv. >>> >>> By using make rules, tests that depend on specific Python libs >>> can set that rule as a requirement, along with rules that require >>> the presence or installation of specific libraries. >>> >>> The tests/venv-requirements.txt is supposed to contain the >>> Python requirements that should be added to the venv created >>> by check-venv. >> >> Maybe you (or Eduardo...) what you wrote in the cover: >> >> There's one current caveat: it requires Python 3, as it's based on th= e >> venv module. >> >> To explain: >> >> $ make check-acceptance >> /usr/bin/python2: No module named venv >> make: *** [/home/phil/source/qemu/tests/Makefile.include:1033:] Error = 1 >=20 > Oops, this doesn't look very friendly. >=20 > But note that this would become a non-issue if we start requiring > Python 3 for building QEMU. >=20 >=20 IIUC, printing a "Can't create tests venv on Python 2", and aborting, would be enough, right? - Cleber. >> >>> >>> Signed-off-by: Cleber Rosa >>> --- >>> tests/Makefile.include | 20 ++++++++++++++++++++ >>> tests/venv-requirements.txt | 3 +++ >>> 2 files changed, 23 insertions(+) >>> create mode 100644 tests/venv-requirements.txt >>> >>> diff --git a/tests/Makefile.include b/tests/Makefile.include >>> index 5eadfd52f9..b66180efa1 100644 >>> --- a/tests/Makefile.include >>> +++ b/tests/Makefile.include >>> @@ -12,6 +12,7 @@ check-help: >>> @echo " $(MAKE) check-block Run block tests" >>> @echo " $(MAKE) check-tcg Run TCG tests" >>> @echo " $(MAKE) check-report.html Generates an HTML test report" >>> + @echo " $(MAKE) check-venv Creates a Python venv for test= s" >>> @echo " $(MAKE) check-clean Clean the tests" >>> @echo >>> @echo "Please note that HTML reports do not regenerate if the unit = tests" >>> @@ -1017,6 +1018,24 @@ check-decodetree: >>> ./check.sh "$(PYTHON)" "$(SRC_PATH)/scripts/decodetree.py"= , \ >>> TEST, decodetree.py) >>> =20 >>> +# Python venv for running tests >>> + >>> +.PHONY: check-venv >>> + >>> +TESTS_VENV_DIR=3D$(BUILD_DIR)/tests/venv >>> +TESTS_VENV_REQ=3D$(SRC_PATH)/tests/venv-requirements.txt >>> + >>> +$(TESTS_VENV_DIR): $(TESTS_VENV_REQ) >>> + $(call quiet-command, \ >>> + $(PYTHON) -m venv --system-site-packages $@, \ >>> + VENV, $@) >>> + $(call quiet-command, \ >>> + $(TESTS_VENV_DIR)/bin/python -m pip -q install -r $(TEST= S_VENV_REQ), \ >>> + PIP, $(TESTS_VENV_REQ)) >>> + $(call quiet-command, touch $@) >> >> Hmm maybe we should print something like: >> >> "You can now activate this virtual environment using: >> source $(TESTS_VENV_DIR)/tests/venv/bin/activate" >=20 > I'm not sure this would be necessary: I expect usage of the venv > to be completely transparent. >=20 > If we require people to learn what venv is and manually activate > it, I'd say we have failed to provide usable tools for running > the tests. >=20 >=20 >> >>> + >>> +check-venv: $(TESTS_VENV_DIR) >>> + >>> # Consolidated targets >>> =20 >>> .PHONY: check-qapi-schema check-qtest check-unit check check-clean >>> @@ -1030,6 +1049,7 @@ check-clean: >>> rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) >>> rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest= -$(target)-y)) $(check-qtest-generic-y)) >>> rm -f tests/test-qapi-gen-timestamp >>> + rm -rf $(TESTS_VENV_DIR) >>> =20 >>> clean: check-clean >>> =20 >>> diff --git a/tests/venv-requirements.txt b/tests/venv-requirements.tx= t >>> new file mode 100644 >>> index 0000000000..d39f9d1576 >>> --- /dev/null >>> +++ b/tests/venv-requirements.txt >>> @@ -0,0 +1,3 @@ >>> +# Add Python module requirements, one per line, to be installed >>> +# in the tests/venv Python virtual environment. For more info, >>> +# refer to: https://pip.pypa.io/en/stable/user_guide/#id1 >>> >> >> Tested-by: Philippe Mathieu-Daud=C3=A9 >=20 --=20 Cleber Rosa [ Sr Software Engineer - Virtualization Team - Red Hat ] [ Avocado Test Framework - avocado-framework.github.io ] [ 7ABB 96EB 8B46 B94D 5E0F E9BB 657E 8D33 A5F2 09F3 ]