From: John Snow <jsnow@redhat.com>
To: Kevin Wolf <kwolf@redhat.com>, qemu-block@nongnu.org
Cc: mreitz@redhat.com, qemu-devel@nongnu.org, ehabkost@redhat.com
Subject: Re: [Qemu-devel] [PATCH] iotests: Require Python 3.5 or later
Date: Wed, 18 Sep 2019 14:49:25 -0400 [thread overview]
Message-ID: <b0f72b9f-69b1-4e1d-4321-d30c7d85355f@redhat.com> (raw)
In-Reply-To: <20190918085519.17290-1-kwolf@redhat.com>
On 9/18/19 4:55 AM, Kevin Wolf wrote:
> Running iotests is not required to build QEMU, so we can have stricter
> version requirements for Python here and can make use of new features
> and drop compatibility code earlier.
>
> This makes qemu-iotests skip all Python tests if a Python version before
> 3.5 is used for the build.
>
> Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> tests/qemu-iotests/check | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index 875399d79f..a68f414d6c 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -633,6 +633,13 @@ then
> export SOCKET_SCM_HELPER="$build_iotests/socket_scm_helper"
> fi
>
> +# Note that if the Python conditional here evaluates True we will exit
> +# with status 1 which is a shell 'false' value.
> +python_usable=false
> +if ! $PYTHON -c 'import sys; sys.exit(sys.version_info >= (3,5))'; then
> + python_usable=true
> +fi
> +
Do we want this as a temporary fix only until we can stipulate the same
version in the configure file?
If so, leaving a comment with "python2" in it anywhere will help locate
this later.
> default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p')
> default_alias_machine=$($QEMU_PROG -machine help | \
> sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }")
> @@ -809,7 +816,12 @@ do
> start=$(_wallclock)
>
> if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python" ]; then
> - run_command="$PYTHON $seq"
> + if $python_usable; then
> + run_command="$PYTHON $seq"
> + else
> + run_command="false"
> + echo "Unsupported Python version" > $seq.notrun
> + fi
> else
> run_command="./$seq"
> fi
>
If you agree with my suggestion:
Reviewed-by: John Snow <jsnow@redhat.com>
If you don't, that's, like, your opinion, man.
next prev parent reply other threads:[~2019-09-18 18:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-18 8:55 [Qemu-devel] [PATCH] iotests: Require Python 3.5 or later Kevin Wolf
2019-09-18 9:16 ` Thomas Huth
2019-09-18 9:20 ` Max Reitz
2019-09-18 9:29 ` Kevin Wolf
2019-09-18 11:20 ` Philippe Mathieu-Daudé
2019-09-18 18:49 ` John Snow [this message]
2019-09-19 1:15 ` Eduardo Habkost
2019-09-19 8:35 ` Kevin Wolf
2019-09-19 16:45 ` John Snow
2019-09-19 16:57 ` John Snow
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=b0f72b9f-69b1-4e1d-4321-d30c7d85355f@redhat.com \
--to=jsnow@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).