[v1,09/26] tests/vm: Use python configured on build

Message ID	20190530101603.22254-10-alex.bennee@linaro.org
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:46 +0100 Message-Id: <20190530101603.22254-10-alex.bennee@linaro.org> In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v1 09/26] tests/vm: Use python configured on build Precedence: list Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Wainer dos Santos Moschetta <wainersm@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	testing/next queue (iotests, docker, tests/vm) \| expand [v1,00/26] testing/next queue (iotests, docker, tests/vm) [v1,01/26] editorconfig: add setting for shell scripts [v1,02/26] qemu-io-cmds: use clock_gettime for benchmarking [v1,03/26] tests: Run the iotests during "make check" again [v1,04/26] tests/docker: Update the Fedora image to Fedora 30 [v1,05/26] tests/docker: Update the Fedora cross compile images to 30 [v1,06/26] tests/docker: Update the Ubuntu image to 19.04 [v1,07/26] .travis.yml: bump gcc sanitiser job to gcc-9 [v1,08/26] .travis.yml: add clang ubsan job [v1,09/26] tests/vm: Use python configured on build [v1,10/26] tests/vm: Port basevm to Python 3 [v1,11/26] tests/vm: Fix build-centos docker-based tests run [v1,12/26] tests/vm: Add missing variables on help [v1,13/26] scripts: use git archive in archive-source [v1,14/26] tests/vm: python3 fixes [v1,15/26] tests/vm: send proxy environment variables over ssh [v1,16/26] tests/vm: use ssh with pty unconditionally [v1,17/26] tests/vm: run test builds on snapshot [v1,18/26] tests/vm: proper guest shutdown [v1,19/26] tests/vm: add vm-boot-{ssh, serial}-<guest> targets [v1,20/26] tests/vm: add DEBUG=1 to help text [v1,21/26] tests/vm: serial console support helpers [v1,22/26] tests/vm: openbsd autoinstall, using serial console [v1,23/26] tests/vm: freebsd autoinstall, using serial console [v1,24/26] tests/vm: netbsd autoinstall, using serial console [v1,25/26] tests/vm: fedora autoinstall, using serial console [v1,26/26] tests/vm: ubuntu.i386: apt proxy setup

Message ID

20190530101603.22254-10-alex.bennee@linaro.org

State

New

Headers

From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Date: Thu, 30 May 2019 11:15:46 +0100
Message-Id: <20190530101603.22254-10-alex.bennee@linaro.org>
In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org>
References: <20190530101603.22254-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH v1 09/26] tests/vm: Use python configured on
	build
Precedence: list
Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=
	<philmd@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, Wainer dos Santos Moschetta
	<wainersm@redhat.com>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

testing/next queue (iotests, docker, tests/vm) | expand

Commit Message

Alex Bennée May 30, 2019, 10:15 a.m. UTC

From: Wainer dos Santos Moschetta <wainersm@redhat.com>

Changed the vm-test makefile to execute python scripts
with the interpreter configured on build. This allows to
run vm-test targets properly in Linux distros with Python 3
only support.

Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20190329210804.22121-2-wainersm@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/vm/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé May 31, 2019, 6:22 a.m. UTC | #1

On 5/30/19 12:15 PM, Alex Bennée wrote:
> From: Wainer dos Santos Moschetta <wainersm@redhat.com>
> 
> Changed the vm-test makefile to execute python scripts
> with the interpreter configured on build. This allows to
> run vm-test targets properly in Linux distros with Python 3
> only support.
> 
> Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
> Message-Id: <20190329210804.22121-2-wainersm@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  tests/vm/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
> index 992d823f6bd..6f82676306d 100644
> --- a/tests/vm/Makefile.include
> +++ b/tests/vm/Makefile.include
> @@ -35,7 +35,7 @@ $(IMAGES_DIR)/%.img:	$(SRC_PATH)/tests/vm/% \
>  			$(SRC_PATH)/tests/vm/Makefile.include
>  	@mkdir -p $(IMAGES_DIR)
>  	$(call quiet-command, \
> -		$< \
> +		$(PYTHON) $< \
>  		$(if $(V)$(DEBUG), --debug) \
>  		--image "$@" \
>  		--force \
> @@ -46,7 +46,7 @@ $(IMAGES_DIR)/%.img:	$(SRC_PATH)/tests/vm/% \
>  # Build in VM $(IMAGE)
>  vm-build-%: $(IMAGES_DIR)/%.img
>  	$(call quiet-command, \
> -		$(SRC_PATH)/tests/vm/$* \
> +		$(PYTHON) $(SRC_PATH)/tests/vm/$* \
>  		$(if $(V)$(DEBUG), --debug) \
>  		$(if $(DEBUG), --interactive) \
>  		$(if $(J),--jobs $(J)) \
>

diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index 992d823f6bd..6f82676306d 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -35,7 +35,7 @@  $(IMAGES_DIR)/%.img:	$(SRC_PATH)/tests/vm/% \
 			$(SRC_PATH)/tests/vm/Makefile.include
 	@mkdir -p $(IMAGES_DIR)
 	$(call quiet-command, \
-		$< \
+		$(PYTHON) $< \
 		$(if $(V)$(DEBUG), --debug) \
 		--image "$@" \
 		--force \
@@ -46,7 +46,7 @@  $(IMAGES_DIR)/%.img:	$(SRC_PATH)/tests/vm/% \
 # Build in VM $(IMAGE)
 vm-build-%: $(IMAGES_DIR)/%.img
 	$(call quiet-command, \
-		$(SRC_PATH)/tests/vm/$* \
+		$(PYTHON) $(SRC_PATH)/tests/vm/$* \
 		$(if $(V)$(DEBUG), --debug) \
 		$(if $(DEBUG), --interactive) \
 		$(if $(J),--jobs $(J)) \

[v1,09/26] tests/vm: Use python configured on build

Commit Message

Comments

Patch