From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49261C35280 for ; Wed, 2 Oct 2019 16:24:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CFCEA21920 for ; Wed, 2 Oct 2019 16:24:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CFCEA21920 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFhQQ-0003FE-Tm for qemu-devel@archiver.kernel.org; Wed, 02 Oct 2019 12:24:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58833) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFhLI-0005mS-6U for qemu-devel@nongnu.org; Wed, 02 Oct 2019 12:19:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFhLG-00021Z-W2 for qemu-devel@nongnu.org; Wed, 02 Oct 2019 12:19:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53348) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFhLE-0001vt-E2; Wed, 02 Oct 2019 12:19:04 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6B2AE316D8D1; Wed, 2 Oct 2019 16:19:02 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-198.ams2.redhat.com [10.36.117.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6432B5D713; Wed, 2 Oct 2019 16:19:01 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL v2 3/4] iotests: Require Python 3.6 or later Date: Wed, 2 Oct 2019 18:18:50 +0200 Message-Id: <20191002161851.1016-4-kwolf@redhat.com> In-Reply-To: <20191002161851.1016-1-kwolf@redhat.com> References: <20191002161851.1016-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 02 Oct 2019 16:19:02 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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.6 is used for the build. Suggested-by: Eduardo Habkost Signed-off-by: Kevin Wolf Reviewed-by: Eduardo Habkost Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/check | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 875399d79f..588c453a94 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -633,6 +633,12 @@ then export SOCKET_SCM_HELPER=3D"$build_iotests/socket_scm_helper" fi =20 +python_usable=3Dfalse +if $PYTHON -c 'import sys; sys.exit(0 if sys.version_info >=3D (3,6) els= e 1)' +then + python_usable=3Dtrue +fi + default_machine=3D$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*= //p') default_alias_machine=3D$($QEMU_PROG -machine help | \ sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }") @@ -809,7 +815,12 @@ do start=3D$(_wallclock) =20 if [ "$(head -n 1 "$source_iotests/$seq")" =3D=3D "#!/usr/bin/en= v python" ]; then - run_command=3D"$PYTHON $seq" + if $python_usable; then + run_command=3D"$PYTHON $seq" + else + run_command=3D"false" + echo "Unsupported Python version" > $seq.notrun + fi else run_command=3D"./$seq" fi --=20 2.20.1