From: Sam James <sam@gentoo.org>
Date: Fri, 8 Mar 2024 14:24:20 +0000 (+0100)
Subject: contrib: Improve dg-extract-results.sh's Python detection [PR109668]
X-Git-Tag: releases/gcc-13.3.0~332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c4785e77e8b54109fbb4f81a3b624e98184c2aa;p=thirdparty%2Fgcc.git

contrib: Improve dg-extract-results.sh's Python detection [PR109668]

'python' on some systems (e.g. SLES 15) might be Python 2. Prefer python3,
then python, then python2 (as the script still tries to work there).

	PR other/109668
	* dg-extract-results.sh: Check for python3 before python. Check for
	python2 last.

(cherry picked from commit 64273a7e6bd8ba60058174d147521dd65d705637)
---

diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh
index 33968ed7b236..3c8a5ca0ecf6 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 python3 python python2 ; 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 <<EOF >&2