public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-6345] testsuite: Don't include multiline patterns in the the pass/fail log
@ 2023-02-25 19:43 Hans-Peter Nilsson
  0 siblings, 0 replies; only message in thread
From: Hans-Peter Nilsson @ 2023-02-25 19:43 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:a24b2720de5d888a936c350378ae864b81f1a022

commit r13-6345-ga24b2720de5d888a936c350378ae864b81f1a022
Author: Hans-Peter Nilsson <hp@axis.com>
Date:   Fri Feb 24 18:41:13 2023 +0100

    testsuite: Don't include multiline patterns in the the pass/fail log
    
    I see overlong lines in the output when a test fails, for
    example for a bug exposed for cris-elf and pru-elf in
    gcc.dg/analyzer/allocation-size-multiline-3.c:
    
    Running /x/gcc/testsuite/gcc.dg/analyzer/analyzer.exp ...
    FAIL: gcc.dg/analyzer/allocation-size-multiline-3.c expected multiline pattern lines 16-25 not found: "\s*int32_t \*ptr = alloca \(99\);[^\n\r]*\n                  \^~~~~~\n  'test_constant_99': events 1-2[^\n\r]*\n    \|[^\n\r]*\n    \|   int32_t \*ptr = alloca \(99\);[^\n\r]*\n    \|                  \^~~~~~\n    \|                  \|[^\n\r]*\n    \|                  \(1\) allocated 99 bytes here[^\n\r]*\n    \|                  \(2\) assigned to 'int32_t \*' \{aka 'int \*'\} here; 'sizeof \(int32_t \{aka int\}\)' is '4'[^\n\r]*\n    \|[^\n\r]*\n"
    FAIL: gcc.dg/analyzer/allocation-size-multiline-3.c expected multiline pattern lines 34-43 not found: "   int32_t \*ptr = alloca \(n \* 2\);[^\n\r]*\n                  \^~~~~~\n  'test_symbolic': events 1-2[^\n\r]*\n    \|[^\n\r]*\n    \|   int32_t \*ptr = alloca \(n \* 2\);[^\n\r]*\n    \|                  \^~~~~~\n    \|                  \|[^\n\r]*\n    \|                  \(1\) allocated 'n \* 2' bytes here[^\n\r]*\n    \|                  \(2\) assigned to 'int32_t \*' \{aka 'int \*'\} here; 'sizeof \(int32_t \{aka int\}\)' is '4'[^\n\r]*\n    \|[^\n\r]*\n"
    FAIL: gcc.dg/analyzer/allocation-size-multiline-3.c (test for excess errors)
    
    That multiline-pattern-quoted-on-a-single-line is redundant
    when also outputting "lines 16-25" and "lines 34-43".  It's
    also so noisy that it can be mistaken for a testsuite error.
    If there's a need to inspect it, it can be seen at
    verbose-level 4, i.e. persons interested in seeing it
    without editing sources can just add "-v -v -v -v".
    
    Let's "prune" the pattern from regular output, instead producing:
    Running /x/gcc/testsuite/gcc.dg/analyzer/analyzer.exp ...
    FAIL: gcc.dg/analyzer/allocation-size-multiline-3.c expected multiline pattern lines 16-25 not found
    FAIL: gcc.dg/analyzer/allocation-size-multiline-3.c expected multiline pattern lines 34-43 not found
    FAIL: gcc.dg/analyzer/allocation-size-multiline-3.c (test for excess errors)
    
            * lib/multiline.exp (handle-multiline-outputs): Don't include the
            quoted multiline pattern in the pass/fail output.

Diff:
---
 gcc/testsuite/lib/multiline.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/lib/multiline.exp b/gcc/testsuite/lib/multiline.exp
index 84ba9216642..5eccf2bbebc 100644
--- a/gcc/testsuite/lib/multiline.exp
+++ b/gcc/testsuite/lib/multiline.exp
@@ -169,9 +169,9 @@ proc handle-multiline-outputs { text } {
 	# Use "regsub" to attempt to prune the pattern from $text
 	if {[regsub -line $rexp $text "" text]} {
 	    # The multiline pattern was pruned.
-	    ${maybe_x}pass "$title was found: \"$escaped_regex\""
+	    ${maybe_x}pass "$title was found"
 	} else {
-	    ${maybe_x}fail "$title not found: \"$escaped_regex\""
+	    ${maybe_x}fail "$title not found"
 	}
 
 	set index [expr $index + 1]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-02-25 19:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-25 19:43 [gcc r13-6345] testsuite: Don't include multiline patterns in the the pass/fail log Hans-Peter Nilsson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).