From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCQF3-00065e-IA for qemu-devel@nongnu.org; Tue, 16 Oct 2018 10:22:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCQF0-0007fr-41 for qemu-devel@nongnu.org; Tue, 16 Oct 2018 10:22:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49200) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gCQEy-0007am-NU for qemu-devel@nongnu.org; Tue, 16 Oct 2018 10:22:33 -0400 References: <20181012165347.2117-1-crosa@redhat.com> <20181012165347.2117-2-crosa@redhat.com> <15152430-8023-2fac-2bbe-0876ac632e9d@redhat.com> <6d2a1a03-4362-cfbd-3670-cb67d4277ee8@redhat.com> From: Cleber Rosa Message-ID: <3f92fe1c-98e3-a1ed-e850-97b0a85734bd@redhat.com> Date: Tue, 16 Oct 2018 10:22:01 -0400 MIME-Version: 1.0 In-Reply-To: <6d2a1a03-4362-cfbd-3670-cb67d4277ee8@redhat.com> 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: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , ccarrara@redhat.com, qemu-devel@nongnu.org Cc: Laszlo Ersek , Stefan Hajnoczi , =?UTF-8?Q?Alex_Benn=c3=a9e?= , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Fam Zheng , Eduardo Habkost On 10/15/18 6:22 PM, Philippe Mathieu-Daud=C3=A9 wrote: > On 15/10/2018 21:04, Caio Carrara wrote: >> On 12-10-2018 13: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. >>> >>> Signed-off-by: Cleber Rosa >>> --- >>> tests/Makefile.include | 20 ++++++++++++++++++++ >>> tests/venv-requirements.txt | 3 +++ >> >> Any special reason to name `venv-requirements.txt` instead of only >> `requirements.txt`? I think the second way is better (if there's no >> cons) since it's the default from most of Python projects. Besides tha= t >> seems more semantic to have a `tests/requirements.txt` file that >> registers the requirements for tests. >=20 > Agreed. >=20 I found it to be more explicit. Naming it "requirements.txt", is usually done in first-level directories of Python projects. So, I'd put it in "tests/acceptance/requirements.txt" if it was supposed to be used *only* by acceptance tests (see previous response). But, if the majority prefers the more traditional name, I can certainly go with it. >> >> Still in this topic. As far as I could see, the files in `tests/` >> directory are almost all C source code. The right place for the Python >> requirements seems the `tests/acceptance/` directory specially because >> the subject of all this patches. Keeping only one requirements file fo= r >> all kinds of tests (that uses Python) can be problematic in my opinion= . >> If it makes any sense, probably is also a good idea rename the target >> from `check-venv` to something like `check-acceptance-venv`. >=20 > Yes. >=20 I disagree because that was not my original motivation. As explained in the previous response, the motivation was to have a venv that could be used for running all Python based tests. - Cleber. >> >>> 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 $@) >>> + >>> +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 >>> >> >> --=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 ]