| Message ID | 4FE9FF98.8000000@mentor.com |
|---|---|
| State | New |
| Headers | show |
On Jun 26, 2012, at 11:29 AM, Janis Johnson wrote: > Procedure scan-dump-times in scandump.exp uses a printable version of > the scanned pattern in the line reported to the test summary but others > in that file don't. > OK for trunk? Ok.
Hi! It's been a while... ;-) On 2012-06-26T11:29:44-0700, Janis Johnson <janis_johnson@mentor.com> wrote: > Procedure scan-dump-times in scandump.exp uses a printable version of > the scanned pattern in the line reported to the test summary but others > in that file don't. This patch fixes that in the remaining procedures > in scandump.exp. The primary advantage of using the printable pattern > is with patterns that include newlines, to keep the pattern all on the > same line in the test summary. > > Tested on i686-pc-linux-gnu for gcc and g++. OK for trunk? This commit, r188996, contained a typo: > --- lib/scandump.exp (revision 188974) > +++ lib/scandump.exp (working copy) > + set printable_pattern [make_pattern_printable [lindex $args 1]] Not here... > + set printable_pattern [make_pattern_printable [lindex $args 1]] ..., and not here... > + set printable_pattern [make_pattern_printable [lindex $args 1]] ..., and not here... > + set printable_pattern [make_pattern_printable [lindex $args 1] ..., but here, in 'scan-dump-dem-not'. If I got my greping right, nothing has actually ever used (any of?) the "demangled" scanning, so we might as well remove it as unused? Anyway, I shall in a while add a testcase that does use it (... but just to test all available variants), so, as obvious, pushed commit 3407bfc136bb6b9cf8e25eb753b448b527590b3b "[testsuite] Fix TCL syntax error in 'scan-dump-dem-not'" to master branch, see attached. Grüße Thomas ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
Index: lib/scandump.exp =================================================================== --- lib/scandump.exp (revision 188974) +++ lib/scandump.exp (working copy) @@ -47,8 +47,9 @@ set testcase [testname-for-summary] + set printable_pattern [make_pattern_printable [lindex $args 1]] set suf [dump-suffix [lindex $args 2]] - set testname "$testcase scan-[lindex $args 0]-dump $suf \"[lindex $args 1]\"" + set testname "$testcase scan-[lindex $args 0]-dump $suf \"$printable_pattern\"" set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { @@ -126,8 +127,9 @@ } set testcase [testname-for-summary] + set printable_pattern [make_pattern_printable [lindex $args 1]] set suf [dump-suffix [lindex $args 2]] - set testname "$testcase scan-[lindex $args 0]-dump-not $suf \"[lindex $args 1]\"" + set testname "$testcase scan-[lindex $args 0]-dump-not $suf \"$printable_pattern\"" set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { @@ -178,8 +180,9 @@ } set testcase [testname-for-summary] + set printable_pattern [make_pattern_printable [lindex $args 1]] set suf [dump-suffix [lindex $args 2]] - set testname "$testcase scan-[lindex $args 0]-dump-dem $suf \"[lindex $args 1]\"" + set testname "$testcase scan-[lindex $args 0]-dump-dem $suf \"$printable_pattern\"" set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { @@ -229,8 +232,9 @@ } set testcase [testname-for-summary] + set printable_pattern [make_pattern_printable [lindex $args 1] set suf [dump-suffix [lindex $args 2]] - set testname "$testcase scan-[lindex $args 0]-dump-dem-not $suf \"[lindex $args 1]\"" + set testname "$testcase scan-[lindex $args 0]-dump-dem-not $suf \"$printable_pattern\"" set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } {