All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <rth@twiddle.net>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@virtuozzo.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	qemu-block@nongnu.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	"Michael Roth" <mdroth@linux.vnet.ibm.com>,
	"Max Reitz" <mreitz@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Fam Zheng" <fam@euphon.net>, "Kevin Wolf" <kwolf@redhat.com>,
	kvm@vger.kernel.org
Subject: [PATCH v2 02/12] tests/qemu-iotests/check: Allow use of python3 interpreter
Date: Thu, 30 Jan 2020 17:32:22 +0100	[thread overview]
Message-ID: <20200130163232.10446-3-philmd@redhat.com> (raw)
In-Reply-To: <20200130163232.10446-1-philmd@redhat.com>

As we want to enforce a unique and explicit Python 3 interpreter,
we need let this script handle 'python3' too.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/qemu-iotests/check | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 2890785a10..bdcd64aea4 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -825,7 +825,8 @@ do
 
         start=$(_wallclock)
 
-        if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python" ]; then
+        if [ "$(head -n 1 "$source_iotests/$seq" | sed 's/3$//')" \
+            == "#!/usr/bin/env python" ]; then
             if $python_usable; then
                 run_command="$PYTHON $seq"
             else
-- 
2.21.1


WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>, "Kevin Wolf" <kwolf@redhat.com>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@virtuozzo.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	qemu-block@nongnu.org, "Juan Quintela" <quintela@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Michael Roth" <mdroth@linux.vnet.ibm.com>,
	kvm@vger.kernel.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v2 02/12] tests/qemu-iotests/check: Allow use of python3 interpreter
Date: Thu, 30 Jan 2020 17:32:22 +0100	[thread overview]
Message-ID: <20200130163232.10446-3-philmd@redhat.com> (raw)
In-Reply-To: <20200130163232.10446-1-philmd@redhat.com>

As we want to enforce a unique and explicit Python 3 interpreter,
we need let this script handle 'python3' too.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/qemu-iotests/check | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 2890785a10..bdcd64aea4 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -825,7 +825,8 @@ do
 
         start=$(_wallclock)
 
-        if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python" ]; then
+        if [ "$(head -n 1 "$source_iotests/$seq" | sed 's/3$//')" \
+            == "#!/usr/bin/env python" ]; then
             if $python_usable; then
                 run_command="$PYTHON $seq"
             else
-- 
2.21.1



  parent reply	other threads:[~2020-01-30 16:33 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-30 16:32 [PATCH v2 00/12] python: Explicit usage of Python 3 Philippe Mathieu-Daudé
2020-01-30 16:32 ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 01/12] scripts/checkpatch.pl: Only allow Python 3 interpreter Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` Philippe Mathieu-Daudé [this message]
2020-01-30 16:32   ` [PATCH v2 02/12] tests/qemu-iotests/check: Allow use of python3 interpreter Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 03/12] tests/qemu-iotests: Explicit usage of Python 3 (scripts with __main__) Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 04/12] tests: Explicit usage of Python 3 Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 05/12] scripts: Explicit usage of Python 3 (scripts with __main__) Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 06/12] scripts/minikconf: Explicit usage of Python 3 Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 07/12] tests/acceptance: Remove shebang header Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 23:47   ` Philippe Mathieu-Daudé
2020-01-30 23:47     ` Philippe Mathieu-Daudé
2020-03-24 10:19   ` Alex Bennée
2020-03-24 10:19     ` Alex Bennée
2020-01-30 16:32 ` [PATCH v2 08/12] scripts/tracetool: " Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 09/12] tests/vm: " Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 10/12] tests/qemu-iotests: Explicit usage of Python3 (scripts without __main__) Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 11/12] scripts: Explicit usage of Python 3 " Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-01-30 16:32 ` [PATCH v2 12/12] tests/qemu-iotests/check: Only check for Python 3 interpreter Philippe Mathieu-Daudé
2020-01-30 16:32   ` Philippe Mathieu-Daudé
2020-02-04 16:06 ` [PATCH v2 00/12] python: Explicit usage of Python 3 Paolo Bonzini
2020-02-04 16:06   ` Paolo Bonzini
2020-02-04 17:20 ` Philippe Mathieu-Daudé
2020-02-04 17:20   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200130163232.10446-3-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=crosa@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=fam@euphon.net \
    --cc=kvm@vger.kernel.org \
    --cc=kwolf@redhat.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=rth@twiddle.net \
    --cc=stefanha@redhat.com \
    --cc=vsementsov@virtuozzo.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.