Re: dg-extract-results.sh truncates logs containing "Running "

[David Blaikie <dblaikie@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]

& now with an actual GCC patch, instead of the GDB one - sorry about that.

On Tue, Jan 15, 2013 at 8:31 AM, David Blaikie <dblaikie@gmail.com> wrote:
> The regex to detect the beginning of a test file execution was too
> broad, matching any line beginning with "Running ". This caused
> dg-extract-results.sh to truncate some test logs, including
> gdb.base/help.exp in the GDB test suite (which tests "help running",
> printing "Running the program.")
>
> The attached patch makes the match a little more precise to avoid
> this. With this the exact count of PASS/FAIL/etc lines in the
> dg-extract-results.sh output matches the counts in the computed
> summary exactly for all cases I've seen.
>
> I encountered this in the GDB test suite but was asked to submit the
> change upstream to GCC as GDB would prefer to avoid unnecessary local
> changes to the script & this change seems general enough to go in to
> GCC.
>
> I'm still a little fuzzy on the specifics of ChangeLog lines, but
> here's my attempt at one for this change:
>
>     * dg-extract-results.sh: constrain the start-of-log pattern to
> avoid accidentally matching test content

[-- Attachment #2: gcc-extract-running.diff --]
[-- Type: application/octet-stream, Size: 428 bytes --]

Index: contrib/dg-extract-results.sh
===================================================================
--- contrib/dg-extract-results.sh	(revision 195208)
+++ contrib/dg-extract-results.sh	(working copy)
@@ -288,7 +288,7 @@
 /^Using / {
   if (variant == curvar && print_using) { print; next }
 }
-/^Running / {
+/^Running .*\\.exp \\.\\.\\./ {
   print_using=0
   if (variant == curvar) {
     if (need_close) close(curfile)