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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 02DBEC2D0DB for ; Thu, 30 Jan 2020 16:33:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7E912083E for ; Thu, 30 Jan 2020 16:33:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gI7Rn1I1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727303AbgA3QdQ (ORCPT ); Thu, 30 Jan 2020 11:33:16 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23611 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727268AbgA3QdP (ORCPT ); Thu, 30 Jan 2020 11:33:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580401995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OkZXP4rQ+IMQ4I/BEDdjSDu3MfCKUVX/p/IE/cPS0M4=; b=gI7Rn1I1NSexTSh//MGDzqNR4/duZYEGI3ZSlLPDuldmhAhY2TfG1dTGjl2Vl6SpGjUwY6 f+X/RVqXsvf0dHC9advjBhZ79lsSCoSPOevRtnvT4b9ttFhjNyk7u2u18HHfqi25Ehz1xX qQOPE/HoJllM6/IOScpUvBMBDSwe3NA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-rsll8GFiO7uWXVdGiC4EtA-1; Thu, 30 Jan 2020 11:33:12 -0500 X-MC-Unique: rsll8GFiO7uWXVdGiC4EtA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE1DB800D41; Thu, 30 Jan 2020 16:33:10 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C654E5E241; Thu, 30 Jan 2020 16:32:58 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Vladimir Sementsov-Ogievskiy , Eduardo Habkost , "Dr. David Alan Gilbert" , Cleber Rosa , Wainer dos Santos Moschetta , qemu-block@nongnu.org, Stefan Hajnoczi , Juan Quintela , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Michael Roth , Max Reitz , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , Kevin Wolf , 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 Message-Id: <20200130163232.10446-3-philmd@redhat.com> In-Reply-To: <20200130163232.10446-1-philmd@redhat.com> References: <20200130163232.10446-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Content-Transfer-Encoding: quoted-printable Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org As we want to enforce a unique and explicit Python 3 interpreter, we need let this script handle 'python3' too. Suggested-by: Kevin Wolf Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =20 start=3D$(_wallclock) =20 - if [ "$(head -n 1 "$source_iotests/$seq")" =3D=3D "#!/usr/bin/en= v python" ]; then + if [ "$(head -n 1 "$source_iotests/$seq" | sed 's/3$//')" \ + =3D=3D "#!/usr/bin/env python" ]; then if $python_usable; then run_command=3D"$PYTHON $seq" else --=20 2.21.1 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.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 894E8C2D0DB for ; Thu, 30 Jan 2020 16:37:10 +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 54B2D20674 for ; Thu, 30 Jan 2020 16:37:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QfAX5MGM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54B2D20674 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]:35762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixCoX-0005TP-HV for qemu-devel@archiver.kernel.org; Thu, 30 Jan 2020 11:37:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50648) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixCkx-00089Z-4L for qemu-devel@nongnu.org; Thu, 30 Jan 2020 11:33:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixCkr-0007hN-0U for qemu-devel@nongnu.org; Thu, 30 Jan 2020 11:33:22 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:35118 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixCko-0007d3-CC for qemu-devel@nongnu.org; Thu, 30 Jan 2020 11:33:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580401994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OkZXP4rQ+IMQ4I/BEDdjSDu3MfCKUVX/p/IE/cPS0M4=; b=QfAX5MGMhjPsC+3mkO/ltUu6/lEQX1X8Y9BRbngATFB7dNKIurwg6Nudxn+lr9L55AT71i yh5z2ogo45dw7fIvMp4VdMNmUWgJREYCn+zwrXK/HZnAuz5Vury+8O2Foy55uepFPywOpY 3YE51st0qHmjyIwB7YsF45GnJne1hyE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-rsll8GFiO7uWXVdGiC4EtA-1; Thu, 30 Jan 2020 11:33:12 -0500 X-MC-Unique: rsll8GFiO7uWXVdGiC4EtA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE1DB800D41; Thu, 30 Jan 2020 16:33:10 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C654E5E241; Thu, 30 Jan 2020 16:32:58 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/12] tests/qemu-iotests/check: Allow use of python3 interpreter Date: Thu, 30 Jan 2020 17:32:22 +0100 Message-Id: <20200130163232.10446-3-philmd@redhat.com> In-Reply-To: <20200130163232.10446-1-philmd@redhat.com> References: <20200130163232.10446-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: 207.211.31.81 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: Fam Zheng , Kevin Wolf , Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, Juan Quintela , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Wainer dos Santos Moschetta , Michael Roth , kvm@vger.kernel.org, Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini , Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As we want to enforce a unique and explicit Python 3 interpreter, we need let this script handle 'python3' too. Suggested-by: Kevin Wolf Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =20 start=3D$(_wallclock) =20 - if [ "$(head -n 1 "$source_iotests/$seq")" =3D=3D "#!/usr/bin/en= v python" ]; then + if [ "$(head -n 1 "$source_iotests/$seq" | sed 's/3$//')" \ + =3D=3D "#!/usr/bin/env python" ]; then if $python_usable; then run_command=3D"$PYTHON $seq" else --=20 2.21.1