* [PATCH 0/1] dg-extract-results.{sh, py}: Optionally read file list from stdin/file
@ 2026-09-03 18:55 Pedro Alves
2026-09-03 18:55 ` [PATCH 1/1] " Pedro Alves
0 siblings, 1 reply; 4+ messages in thread
From: Pedro Alves @ 2026-09-03 18:55 UTC (permalink / raw)
To: gcc-patches; +Cc: gdb-patches
This patch is for the benefit of GDB, but as the binutils-gdb
repository shares the contrib/ directory with GCC, it must first be
applied to GCC and then copied back to binutils-gdb.
On Windows, GDB's "make check-parallel" dies when combining the
per-test gdb.sum / gdb.log files into the final combined pair:
$ find outputs/ -name gdb.sum | wc -l
2657
.../dg-extract-results.sh: line 39: /ucrt64/bin/python3: Argument list too long
make: *** [Makefile:274: check-parallel] Error 2
The GDB testsuite Makefile passes the whole file list to
contrib/dg-extract-results.sh on the command line, expanded from a
find(1) backtick. As GDB's parallel harness writes one gdb.sum (and
one gdb.log) per test script, on a full run that command line argument
list holds thousands of paths, which overflows the Windows
command-line length limit (~32 KB).
This patch teaches dg-extract-results to read the file list from stdin
(or a file) instead. After this is merged, GDB's Makefile will be
changed to pipe the find output straight in, so the length limit no
longer applies regardless of the host.
The GDB patch making use of this is here, if you're curious:
https://inbox.sourceware.org/gdb-patches/20260723175131.266112-5-pedro@palves.net/
Pedro Alves (1):
dg-extract-results.{sh,py}: Optionally read file list from stdin/file
contrib/dg-extract-results.py | 30 ++++++++++++++++++++++++++----
contrib/dg-extract-results.sh | 17 +++++++++++++++--
2 files changed, 41 insertions(+), 6 deletions(-)
base-commit: b3474d5cddda183dcd8d8a2745fba02578816055
--
2.54.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/1] dg-extract-results.{sh, py}: Optionally read file list from stdin/file 2026-09-03 18:55 [PATCH 0/1] dg-extract-results.{sh, py}: Optionally read file list from stdin/file Pedro Alves @ 2026-09-03 18:55 ` Pedro Alves 2026-09-04 3:08 ` Andrea Pinski 0 siblings, 1 reply; 4+ messages in thread From: Pedro Alves @ 2026-09-03 18:55 UTC (permalink / raw) To: gcc-patches; +Cc: gdb-patches dg-extract-results.sh and dg-extract-results.py take the summary/log files to combine as command-line arguments, one argument per file. That is fine for GCC, whose parallel harness produces a handful of files. GDB uses these scripts too, but its parallel harness writes one .sum (and one .log) per test script, of which there are 2657 at the moment. On Windows, with native Windows python, passing that many sum or log files to dg-extract-results overflows the command-line length limit (~32 KB), and the combine step dies. The .sh wrapper re-execs the faster Python implementation, forwarding the file list, so the overflow can also surface at the re-exec. E.g.: $ make check -j$(nproc) ... make[1]: Leaving directory '/c/msys2/home/alves/gdb/build-testsuite-windows' /c/gdb/src/gdb/testsuite/../../contrib/dg-extract-results.sh: line 39: /ucrt64/bin/python3: Argument list too long /c/gdb/src/gdb/testsuite/../../contrib/dg-extract-results.sh: line 39: /ucrt64/bin/python3: Argument list too long make: *** [Makefile:274: check-parallel] Error 2 ... $ find outputs/ -name gdb.sum | wc -l 2657 Fix it by teaching both dg-extract-results.sh and dg-extract-results.py a new -f option that reads the list of files to process, one per line, from a named file, or from standard input when the argument is "-". The option may be given more than once and mixed with file arguments. A caller can then pipe the file list straight in via "-f -" instead of expanding it onto the command line, so the length limit no longer applies regardless of host or Python flavor. Existing callers can continue working as they were, as passing the file list as one file per argument is still supported. contrib/ChangeLog: * dg-extract-results.py: Handle new "-f list-file" option. * dg-extract-results.sh: Ditto. Change-Id: Iaced5ba228972ce267f355de65fe5ad8a1e38c68 --- contrib/dg-extract-results.py | 30 ++++++++++++++++++++++++++---- contrib/dg-extract-results.sh | 17 +++++++++++++++-- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index 98b0f4989c96..b5d890f64063 100644 --- a/contrib/dg-extract-results.py +++ b/contrib/dg-extract-results.py @@ -164,7 +164,7 @@ class Prog: def usage (self): name = sys.argv[0] sys.stderr.write ('Usage: ' + name - + ''' [-t tool] [-l variant-list] [-L] log-or-sum-file ... + + ''' [-t tool] [-l variant-list] [-L] [-f list-file] log-or-sum-file ... tool The tool (e.g. g++, libffi) for which to create a new test summary file. If not specified then output @@ -174,6 +174,12 @@ class Prog: variants in the files for <tool>. sum-file A test summary file with the format of those created by runtest from DejaGnu. + list-file A file listing the log-or-sum files to process, one + per line. Use "-" to read the list from standard + input. This avoids the command-line length limit + when combining very many files. May be given more + than once, and may be mixed with log-or-sum-file + arguments. If -L is used, merge *.log files instead of *.sum. In this mode the exact order of lines may not be preserved, just different Running *.exp chunks should be in correct order. @@ -189,19 +195,35 @@ class Prog: # Parse the command-line arguments. def parse_cmdline (self): try: - (options, self.files) = getopt.getopt (sys.argv[1:], 'l:t:L') - if len (self.files) == 0: - self.usage() + (options, self.files) = getopt.getopt (sys.argv[1:], 'l:t:Lf:') for (option, value) in options: if option == '-l': self.variations.append (value) elif option == '-t': self.tools.append (value) + elif option == '-f': + self.read_file_list (value) else: self.do_sum = False + if len (self.files) == 0: + self.usage() except getopt.GetoptError as e: self.fatal (None, e.msg) + # Append the files listed in FILENAME, one per line, to self.files. + # FILENAME of "-" means read the list from standard input. Blank + # lines are ignored. + def read_file_list (self, filename): + f = sys.stdin if filename == '-' else open (filename, 'r') + try: + for line in f: + line = line.strip() + if line: + self.files.append (line) + finally: + if f is not sys.stdin: + f.close() + # Try to parse time string TIME, returning an arbitrary time on failure. # Getting this right is just a nice-to-have so failures should be silent. def parse_time (self, time): diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index 6ea897033b57..f3093f94582e 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -42,7 +42,7 @@ done usage() { cat <<EOF >&2 -Usage: $PROGNAME [-t tool] [-l variant-list] [-L] sum-file ... +Usage: $PROGNAME [-t tool] [-l variant-list] [-L] [-f list-file] sum-file ... tool The tool (e.g. g++, libffi) for which to create a new test summary file. If not specified then all @@ -52,6 +52,11 @@ Usage: $PROGNAME [-t tool] [-l variant-list] [-L] sum-file ... variants in the files for <tool>. sum-file A test summary file with the format of those created by runtest from DejaGnu. + list-file A file listing the sum-files to process, one per line. + Use "-" to read the list from standard input. This + avoids the command-line length limit when combining + very many files. May be given more than once, and + may be mixed with sum-file arguments. If -L is used, merge *.log files instead of *.sum. In this mode the exact order of lines may not be preserved, just different Running *.exp chunks should be in correct order. @@ -69,18 +74,26 @@ msg() { VARIANTS="" TOOL="" MODE="sum" +LIST_FILES="" -while getopts "l:t:L" ARG; do +while getopts "l:t:Lf:" ARG; do case $ARG in l) VARIANTS="${VARIANTS} ${OPTARG}";; t) test -z "$TOOL" || (msg "${PROGNAME}: only one tool can be specified"; exit 1); TOOL="${OPTARG}";; L) MODE="log";; + f) if test "${OPTARG}" = "-" ; then + LIST_FILES="${LIST_FILES} `cat`" + else + LIST_FILES="${LIST_FILES} `cat "${OPTARG}"`" + fi;; \?) usage; exit 0;; esac done shift `expr ${OPTIND} - 1` +set -- ${LIST_FILES} "$@" + if test $# -lt 1 ; then usage exit 1 -- 2.54.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] dg-extract-results.{sh, py}: Optionally read file list from stdin/file 2026-09-03 18:55 ` [PATCH 1/1] " Pedro Alves @ 2026-09-04 3:08 ` Andrea Pinski 2026-09-04 12:18 ` Pedro Alves 0 siblings, 1 reply; 4+ messages in thread From: Andrea Pinski @ 2026-09-04 3:08 UTC (permalink / raw) To: Pedro Alves; +Cc: gcc-patches, gdb-patches On Thu, Sep 3, 2026 at 11:57 AM Pedro Alves <pedro@palves.net> wrote: > > dg-extract-results.sh and dg-extract-results.py take the summary/log > files to combine as command-line arguments, one argument per file. > > That is fine for GCC, whose parallel harness produces a handful of > files. > > GDB uses these scripts too, but its parallel harness writes one .sum > (and one .log) per test script, of which there are 2657 at the moment. > > On Windows, with native Windows python, passing that many sum or log > files to dg-extract-results overflows the command-line length limit > (~32 KB), and the combine step dies. > > The .sh wrapper re-execs the faster Python implementation, forwarding > the file list, so the overflow can also surface at the re-exec. > > E.g.: > > $ make check -j$(nproc) > ... > make[1]: Leaving directory '/c/msys2/home/alves/gdb/build-testsuite-windows' > /c/gdb/src/gdb/testsuite/../../contrib/dg-extract-results.sh: line 39: /ucrt64/bin/python3: Argument list too long > /c/gdb/src/gdb/testsuite/../../contrib/dg-extract-results.sh: line 39: /ucrt64/bin/python3: Argument list too long > make: *** [Makefile:274: check-parallel] Error 2 > ... > $ find outputs/ -name gdb.sum | wc -l > 2657 > > Fix it by teaching both dg-extract-results.sh and > dg-extract-results.py a new -f option that reads the list of files to > process, one per line, from a named file, or from standard input when > the argument is "-". The option may be given more than once and mixed > with file arguments. > > A caller can then pipe the file list straight in via "-f -" instead of > expanding it onto the command line, so the length limit no longer > applies regardless of host or Python flavor. > > Existing callers can continue working as they were, as passing the > file list as one file per argument is still supported. > > contrib/ChangeLog: > > * dg-extract-results.py: Handle new "-f list-file" option. > * dg-extract-results.sh: Ditto. Ok. > > Change-Id: Iaced5ba228972ce267f355de65fe5ad8a1e38c68 Note we normally don't have Change-Id in the commit message; I know it is from gerrit so please remove it before pushing the patch. > --- > contrib/dg-extract-results.py | 30 ++++++++++++++++++++++++++---- > contrib/dg-extract-results.sh | 17 +++++++++++++++-- > 2 files changed, 41 insertions(+), 6 deletions(-) > > diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py > index 98b0f4989c96..b5d890f64063 100644 > --- a/contrib/dg-extract-results.py > +++ b/contrib/dg-extract-results.py > @@ -164,7 +164,7 @@ class Prog: > def usage (self): > name = sys.argv[0] > sys.stderr.write ('Usage: ' + name > - + ''' [-t tool] [-l variant-list] [-L] log-or-sum-file ... > + + ''' [-t tool] [-l variant-list] [-L] [-f list-file] log-or-sum-file ... > > tool The tool (e.g. g++, libffi) for which to create a > new test summary file. If not specified then output > @@ -174,6 +174,12 @@ class Prog: > variants in the files for <tool>. > sum-file A test summary file with the format of those > created by runtest from DejaGnu. > + list-file A file listing the log-or-sum files to process, one > + per line. Use "-" to read the list from standard > + input. This avoids the command-line length limit > + when combining very many files. May be given more > + than once, and may be mixed with log-or-sum-file > + arguments. > If -L is used, merge *.log files instead of *.sum. In this > mode the exact order of lines may not be preserved, just different > Running *.exp chunks should be in correct order. > @@ -189,19 +195,35 @@ class Prog: > # Parse the command-line arguments. > def parse_cmdline (self): > try: > - (options, self.files) = getopt.getopt (sys.argv[1:], 'l:t:L') > - if len (self.files) == 0: > - self.usage() > + (options, self.files) = getopt.getopt (sys.argv[1:], 'l:t:Lf:') > for (option, value) in options: > if option == '-l': > self.variations.append (value) > elif option == '-t': > self.tools.append (value) > + elif option == '-f': > + self.read_file_list (value) > else: > self.do_sum = False > + if len (self.files) == 0: > + self.usage() > except getopt.GetoptError as e: > self.fatal (None, e.msg) > > + # Append the files listed in FILENAME, one per line, to self.files. > + # FILENAME of "-" means read the list from standard input. Blank > + # lines are ignored. > + def read_file_list (self, filename): > + f = sys.stdin if filename == '-' else open (filename, 'r') > + try: > + for line in f: > + line = line.strip() > + if line: > + self.files.append (line) > + finally: > + if f is not sys.stdin: > + f.close() > + > # Try to parse time string TIME, returning an arbitrary time on failure. > # Getting this right is just a nice-to-have so failures should be silent. > def parse_time (self, time): > diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh > index 6ea897033b57..f3093f94582e 100755 > --- a/contrib/dg-extract-results.sh > +++ b/contrib/dg-extract-results.sh > @@ -42,7 +42,7 @@ done > > usage() { > cat <<EOF >&2 > -Usage: $PROGNAME [-t tool] [-l variant-list] [-L] sum-file ... > +Usage: $PROGNAME [-t tool] [-l variant-list] [-L] [-f list-file] sum-file ... > > tool The tool (e.g. g++, libffi) for which to create a > new test summary file. If not specified then all > @@ -52,6 +52,11 @@ Usage: $PROGNAME [-t tool] [-l variant-list] [-L] sum-file ... > variants in the files for <tool>. > sum-file A test summary file with the format of those > created by runtest from DejaGnu. > + list-file A file listing the sum-files to process, one per line. > + Use "-" to read the list from standard input. This > + avoids the command-line length limit when combining > + very many files. May be given more than once, and > + may be mixed with sum-file arguments. > If -L is used, merge *.log files instead of *.sum. In this > mode the exact order of lines may not be preserved, just different > Running *.exp chunks should be in correct order. > @@ -69,18 +74,26 @@ msg() { > VARIANTS="" > TOOL="" > MODE="sum" > +LIST_FILES="" > > -while getopts "l:t:L" ARG; do > +while getopts "l:t:Lf:" ARG; do > case $ARG in > l) VARIANTS="${VARIANTS} ${OPTARG}";; > t) test -z "$TOOL" || (msg "${PROGNAME}: only one tool can be specified"; exit 1); > TOOL="${OPTARG}";; > L) MODE="log";; > + f) if test "${OPTARG}" = "-" ; then > + LIST_FILES="${LIST_FILES} `cat`" > + else > + LIST_FILES="${LIST_FILES} `cat "${OPTARG}"`" > + fi;; > \?) usage; exit 0;; > esac > done > shift `expr ${OPTIND} - 1` > > +set -- ${LIST_FILES} "$@" > + > if test $# -lt 1 ; then > usage > exit 1 > -- > 2.54.0 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] dg-extract-results.{sh, py}: Optionally read file list from stdin/file 2026-09-04 3:08 ` Andrea Pinski @ 2026-09-04 12:18 ` Pedro Alves 0 siblings, 0 replies; 4+ messages in thread From: Pedro Alves @ 2026-09-04 12:18 UTC (permalink / raw) To: Andrea Pinski; +Cc: gcc-patches, gdb-patches On 2026-09-04 04:08, Andrea Pinski wrote: >> contrib/ChangeLog: >> >> * dg-extract-results.py: Handle new "-f list-file" option. >> * dg-extract-results.sh: Ditto. > > Ok. Thank you! I've pushed it to both repos. > >> >> Change-Id: Iaced5ba228972ce267f355de65fe5ad8a1e38c68 > > Note we normally don't have Change-Id in the commit message; I know it > is from gerrit so please remove it before pushing the patch. I did that. For the binutils-gdb side, I pushed this follow up patch below, too. --- contrib: sync dg-extract-results.{sh,py} with GCC The previous commit already brought in the code changes, but we're still missing a copyright year update in dg-extract-results.sh, which this now brings in. Record that both files are synced now in the ChangeLog. --- contrib/ChangeLog | 5 +++++ contrib/dg-extract-results.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 8c0a4971fd2..da24bcab232 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2026-09-04 Pedro Alves <pedro@palves.net> + + * dg-extract-results.py: Sync with GCC. + * dg-extract-results.sh: Sync with GCC. + 2026-05-29 Kevin Buettner <kevinb@redhat.com> * dg-extract-results.py: Sync with GCC. diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index d03e1a9b4e1..f3093f94582 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -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-2025 Free Software Foundation, Inc. +# Copyright (C) 2008-2026 Free Software Foundation, Inc. # Contributed by Janis Johnson <janis187@us.ibm.com> # # This file is part of GCC. base-commit: 2e328496db8d224a697d50621563e980cf1d301a -- 2.54.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-09-04 12:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-03 18:55 [PATCH 0/1] dg-extract-results.{sh, py}: Optionally read file list from stdin/file Pedro Alves
2026-09-03 18:55 ` [PATCH 1/1] " Pedro Alves
2026-09-04 3:08 ` Andrea Pinski
2026-09-04 12:18 ` Pedro Alves
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox