mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-23 02:44:18 +08:00
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.
This commit is contained in:
parent
8263a4b650
commit
64273a7e6b
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user