[2/2] contrib: sync dg-extract-results.sh with GCC
Checks
Context |
Check |
Description |
linaro-tcwg-bot/tcwg_binutils_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_binutils_check--master-arm |
success
|
Testing passed
|
Commit Message
This syncs dg-extract-results.sh with GCC.
It contains two commits: r14-4333-g346f5991569fae and r14-9393-g64273a7e6bd8ba.
contrib/ChangeLog:
* dg-extract-results.sh: Sync with GCC.
---
contrib/ChangeLog | 1 +
contrib/dg-extract-results.sh | 21 ++++++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
Comments
>>>>> "Sam" == Sam James <sam@gentoo.org> writes:
Sam> This syncs dg-extract-results.sh with GCC.
Sam> It contains two commits: r14-4333-g346f5991569fae and r14-9393-g64273a7e6bd8ba.
Sam> contrib/ChangeLog:
Sam> * dg-extract-results.sh: Sync with GCC.
Thanks.
Approved-By: Tom Tromey <tom@tromey.com>
Tom
Tom Tromey <tom@tromey.com> writes:
>>>>>> "Sam" == Sam James <sam@gentoo.org> writes:
>
> Sam> This syncs dg-extract-results.sh with GCC.
> Sam> It contains two commits: r14-4333-g346f5991569fae and r14-9393-g64273a7e6bd8ba.
>
> Sam> contrib/ChangeLog:
> Sam> * dg-extract-results.sh: Sync with GCC.
>
> Thanks.
> Approved-By: Tom Tromey <tom@tromey.com>
Thanks, pushed. I also appreciate the speedy reviews on the sync stuff
in particular. It's a bit labourious so getting it done and out of the
way to move onto the next thing is helpful :)
>
> Tom
best,
sam
@@ -1,6 +1,7 @@
2024-03-11 Sam James <sam@gentoo.org>
* dg-extract-results.py: Sync with GCC.
+ * dg-extract-results.sh: Sync with GCC.
2020-09-25 Simon Marchi <simon.marchi@polymtl.ca>
@@ -6,7 +6,7 @@
# The resulting file can be used with test result comparison scripts for
# results from tests that were run in parallel. See usage() below.
-# Copyright (C) 2008, 2009, 2010, 2012 Free Software Foundation
+# Copyright (C) 2008-2024 Free Software Foundation, Inc.
# Contributed by Janis Johnson <janis187@us.ibm.com>
#
# This file is part of GCC.
@@ -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
@@ -271,7 +274,7 @@ cat $SUM_FILES \
# Write the begining of the combined summary file.
-head -n 2 $FIRST_SUM
+head -n 3 $FIRST_SUM
echo
echo " === $TOOL tests ==="
echo