From nobody Fri May 3 18:08:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541776180935165.59895238291892; Fri, 9 Nov 2018 07:09:40 -0800 (PST) Received: from localhost ([::1]:34652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gL8Pf-0008Ox-HI for importer@patchew.org; Fri, 09 Nov 2018 10:09:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gL8Ng-0006oQ-Ep for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gL8Na-0006jY-IK for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42708) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gL8Na-0006iW-Ao for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:26 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 667AC308213A; Fri, 9 Nov 2018 15:07:25 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-124-135.rdu2.redhat.com [10.10.124.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7EDAF600CD; Fri, 9 Nov 2018 15:07:23 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Fri, 9 Nov 2018 10:07:07 -0500 Message-Id: <20181109150710.31085-2-crosa@redhat.com> In-Reply-To: <20181109150710.31085-1-crosa@redhat.com> References: <20181109150710.31085-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 09 Nov 2018 15:07:25 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/4] configure: keep track of Python version X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Caio Carrara , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Some functionality is dependent on the Python version detected/configured on configure. While it's possible to run the Python version later and check for the version, doing it once is preferable. Also, it's a relevant information to keep in build logs, as the overall behavior of the build can be affected by it. Signed-off-by: Cleber Rosa Reviewed-by: Eduardo Habkost --- configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 74e313a810..67fff0290d 100755 --- a/configure +++ b/configure @@ -1740,6 +1740,9 @@ if ! $python -c 'import sys; sys.exit(sys.version_inf= o < (2,7))'; then "Use --python=3D/path/to/python to specify a supported Python." fi =20 +# Preserve python version since some functionality is dependent on it +python_version=3D$($python -V 2>&1 | sed -e 's/Python\ //') + # Suppress writing compiled files python=3D"$python -B" =20 @@ -5918,7 +5921,7 @@ echo "LDFLAGS $LDFLAGS" echo "QEMU_LDFLAGS $QEMU_LDFLAGS" echo "make $make" echo "install $install" -echo "python $python" +echo "python $python ($python_version)" if test "$slirp" =3D "yes" ; then echo "smbd $smbd" fi @@ -6823,6 +6826,7 @@ echo "INSTALL_DATA=3D$install -c -m 0644" >> $config_= host_mak echo "INSTALL_PROG=3D$install -c -m 0755" >> $config_host_mak echo "INSTALL_LIB=3D$install -c -m 0644" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak +echo "PYTHON_VERSION=3D$python_version" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=3D$iasl" >> $config_host_mak --=20 2.19.1 From nobody Fri May 3 18:08:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541776196327466.58074910876553; Fri, 9 Nov 2018 07:09:56 -0800 (PST) Received: from localhost ([::1]:34653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gL8Py-0000jd-Kg for importer@patchew.org; Fri, 09 Nov 2018 10:09:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gL8Nu-0007KW-Hj for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gL8Nn-0006qq-GR for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gL8Nf-0006k7-6T for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:32 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BC3E283F44; Fri, 9 Nov 2018 15:07:27 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-124-135.rdu2.redhat.com [10.10.124.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AEEE26013F; Fri, 9 Nov 2018 15:07:25 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Fri, 9 Nov 2018 10:07:08 -0500 Message-Id: <20181109150710.31085-3-crosa@redhat.com> In-Reply-To: <20181109150710.31085-1-crosa@redhat.com> References: <20181109150710.31085-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 09 Nov 2018 15:07:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] check-venv: use recorded Python version X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Caio Carrara , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The current approach works fine, but it runs Python on every make command (even if it's not related to the venv usage). This is just an optimization, and not a change of behavior. Signed-off-by: Cleber Rosa Reviewed-by: Eduardo Habkost --- tests/Makefile.include | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 074eece558..c0a341c923 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -913,8 +913,7 @@ TESTS_RESULTS_DIR=3D$(BUILD_DIR)/tests/results # information please refer to "avocado --help". AVOCADO_SHOW=3Dnone =20 -PYTHON3 =3D $(shell $(PYTHON) -c 'import sys; print(1 if sys.version_info = >=3D (3, 0) else 0)') -ifeq ($(PYTHON3), 1) +ifneq ($(findstring v2,"v$(PYTHON_VERSION)"),v2) $(TESTS_VENV_DIR): $(TESTS_VENV_REQ) $(call quiet-command, \ $(PYTHON) -m venv --system-site-packages $@, \ --=20 2.19.1 From nobody Fri May 3 18:08:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541776320805862.1255303833229; Fri, 9 Nov 2018 07:12:00 -0800 (PST) Received: from localhost ([::1]:34665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gL8Ry-00045b-Sd for importer@patchew.org; Fri, 09 Nov 2018 10:11:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gL8Nw-0007N7-Gc for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gL8Nt-0007Ai-5S for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42752) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gL8Ng-0006kq-LL for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:35 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A11A3082132; Fri, 9 Nov 2018 15:07:30 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-124-135.rdu2.redhat.com [10.10.124.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E0BC600CD; Fri, 9 Nov 2018 15:07:27 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Fri, 9 Nov 2018 10:07:09 -0500 Message-Id: <20181109150710.31085-4-crosa@redhat.com> In-Reply-To: <20181109150710.31085-1-crosa@redhat.com> References: <20181109150710.31085-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 09 Nov 2018 15:07:30 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] Travis CI: make specified Python versions usable on jobs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Caio Carrara , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" For the two Python jobs, which seem to have the goal of making sure QEMU builds successfully on the 3.0-3.6 spectrum of Python 3 versions, the specified version is only applicable if a Python virtual environment is used. To do that, it's necessary to define the (primary?) language of the job to be Python. Also, Travis doesn't have a 3.0 Python installation available for the chosen distro, 3.2 being the lower version available. Reference: https://docs.travis-ci.com/user/languages/python/#specifying-pyt= hon-versions Signed-off-by: Cleber Rosa Reviewed-by: Alex Benn=C3=A9e --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa49c7b114..5c18d3e268 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,9 +112,11 @@ matrix: compiler: clang # Python builds - env: CONFIG=3D"--target-list=3Dx86_64-softmmu" + language: python python: - - "3.0" + - "3.2" - env: CONFIG=3D"--target-list=3Dx86_64-softmmu" + language: python python: - "3.6" # Acceptance (Functional) tests --=20 2.19.1 From nobody Fri May 3 18:08:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541776307760899.4169498446086; Fri, 9 Nov 2018 07:11:47 -0800 (PST) Received: from localhost ([::1]:34664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gL8Rm-0003xI-8g for importer@patchew.org; Fri, 09 Nov 2018 10:11:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gL8Nz-0007QL-No for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gL8Nw-0007QX-R6 for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42648) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gL8Nw-0006m5-Jz for qemu-devel@nongnu.org; Fri, 09 Nov 2018 10:07:48 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 84EE581DEA; Fri, 9 Nov 2018 15:07:32 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-124-135.rdu2.redhat.com [10.10.124.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 80F41600CD; Fri, 9 Nov 2018 15:07:30 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Fri, 9 Nov 2018 10:07:10 -0500 Message-Id: <20181109150710.31085-5-crosa@redhat.com> In-Reply-To: <20181109150710.31085-1-crosa@redhat.com> References: <20181109150710.31085-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 09 Nov 2018 15:07:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] check-help: visual and content improvements X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Caio Carrara , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The "check" target is not a target that will run all other tests listed, so in order to be accurate it's necessary to list those that will run. The same is true for "check-clean". Then, to give a better visual impression of the differences in the various targets, let's add empty lines. Finally, a small (and hopeful) grammar fix from a non-native speaker. Signed-off-by: Cleber Rosa Reviewed-by: Eduardo Habkost Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Wainer dos Santos Moschetta --- tests/Makefile.include | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index c0a341c923..552faf9bbe 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -3,7 +3,8 @@ check-help: @echo "Regression testing targets:" @echo - @echo " $(MAKE) check Run all tests" + @echo " $(MAKE) check Run unit, qapi-schema, qtest and dec= odetree" + @echo @echo " $(MAKE) check-qtest-TARGET Run qtest tests for given target" @echo " $(MAKE) check-qtest Run qtest tests" @echo " $(MAKE) check-unit Run qobject tests" @@ -12,12 +13,13 @@ check-help: @echo " $(MAKE) check-block Run block tests" @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-acceptance Run all acceptance (functional) test= s" + @echo @echo " $(MAKE) check-report.html Generates an HTML test report" @echo " $(MAKE) check-venv Creates a Python venv for tests" - @echo " $(MAKE) check-clean Clean the tests" + @echo " $(MAKE) check-clean Clean the tests and related data" @echo @echo "Please note that HTML reports do not regenerate if the unit tests" - @echo "has not changed." + @echo "have not changed." @echo @echo "The variable SPEED can be set to control the gtester speed setting= ." @echo "Default options are -k and (for $(MAKE) V=3D1) --verbose; they can= be" --=20 2.19.1