From patchwork Thu Mar 7 14:16:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 1909287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TrBFn4WN4z23hR for ; Fri, 8 Mar 2024 01:17:17 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0D3BC385770F for ; Thu, 7 Mar 2024 14:17:15 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 380593857C65; Thu, 7 Mar 2024 14:16:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 380593857C65 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 380593857C65 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709821016; cv=none; b=XTcqZnh/7oRanTDrPNLTNfntd+xG68vD0FtaB3n9zGPYHDajiwzy6O8QiZpqk+OCfM8Tp5f5unGgLT8wVImIckEiWRXDMC89v2nX4SDT8OVgmkPuBhH0sbOwDBVc7tx96GO4xrqdWGiad8MhYkqHwT4xlwrS6vkBbGvuE/r85bY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709821016; c=relaxed/simple; bh=CEKxNUkqaD0/6aFvvuEknFcOu2QS3V6kLHjFStIfY7Q=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=KAnIssPSBpOIj6vrEqDYcWcFlVtKEIE3HAWdIPKXOkgaubZCrip7pGYkIjuR6XIOJ+TStDYugJ+wE5zp0I/lCUg8yiDxEqWCmuX8MOA0PPRV46j5QKV5LIQH2WvU7nj9WVM3KVfkA3FD83gkGR3H52etH4e4iw6HAxmxTYsYa88= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: gcc-patches@gcc.gnu.org Cc: law@gcc.gnu.org, rguenth@gcc.gnu.org, Sam James Subject: [PATCH] contrib: Improve dg-extract-results.sh's Python detection Date: Thu, 7 Mar 2024 14:16:37 +0000 Message-ID: <20240307141638.153366-1-sam@gentoo.org> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org 'python' on some systems (e.g. SLES 15) might be Python 2. Prefer ${EPYTHON} if defined (used by Gentoo's python-exec wrapping), then python3, then python. contrib/ChangeLog: * dg-extract-results.sh: Check for python3 before python. --- contrib/dg-extract-results.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index 00ef80046f74..2d1cd76fe255 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -28,14 +28,17 @@ PROGNAME=dg-extract-results.sh -# Try to use the python version if possible, since it tends to be faster. +# Try to use the python version if possible, since it tends to be faster and +# produces more stable results. PYTHON_VER=`echo "$0" | sed 's/sh$/py/'` -if test "$PYTHON_VER" != "$0" && - test -f "$PYTHON_VER" && - python -c 'import sys, getopt, re, io, datetime, operator; sys.exit (0 if sys.version_info >= (2, 6) else 1)' \ - > /dev/null 2> /dev/null; then - exec python $PYTHON_VER "$@" -fi +for python in ${EPYTHON:-python3} python ; do + if test "$PYTHON_VER" != "$0" && + test -f "$PYTHON_VER" && + ${python} -c 'import sys, getopt, re, io, datetime, operator; sys.exit (0 if sys.version_info >= (2, 6) else 1)' \ + > /dev/null 2> /dev/null; then + exec ${python} $PYTHON_VER "$@" + fi +done usage() { cat <&2