* [PATCH, GCC/testsuite] Fix retrieval of testname
@ 2017-11-09 18:05 Thomas Preudhomme
2017-11-09 19:04 ` Mike Stump
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Preudhomme @ 2017-11-09 18:05 UTC (permalink / raw)
To: Rainer Orth, Mike Stump, gcc-patches
[-- Attachment #1: Type: text/plain, Size: 1556 bytes --]
When gcc-dg-runtest is used to run a test the test is run several times
with different options. For clarity of the log, the test infrastructure
then append the options to the testname. This means that all the code
that must deal with the testcase itself (eg. removing the output files
after the test has run) needs to remove the option name.
There is already a pattern (see below) for this in several place of the
testsuite framework but it is also missing in many places. This patch
fixes all of these places. The pattern is as follows:
set testcase [testname-for-summary]
; The name might include a list of options; extract the file name.
set testcase [lindex $testcase 0]
ChangeLog entry is as follows:
*** gcc/testsuite/ChangeLog ***
2017-11-08 Thomas Preud'homme <thomas.preudhomme@arm.com>
* lib/scanasm.exp (scan-assembler): Extract filename from testname used
in summary.
(scan-assembler-not): Likewise.
(scan-hidden): Likewise.
(scan-not-hidden): Likewise.
(scan-stack-usage): Likewise.
(scan-stack-usage-not): Likewise.
(scan-assembler-times): Likewise.
(scan-assembler-dem): Likewise.
(scan-assembler-dem-not): Likewise.
(object-size): Likewise.
(scan-lto-assembler): Likewise.
* lib/scandump.exp (scan-dump): Likewise.
(scan-dump-times): Likewise.
(scan-dump-not): Likewise.
(scan-dump-dem): Likewise.
(scan-dump-dem-not): Likewise
Testing: Ran testsuite on bootstrap aarch64-linux-gnu and
x86_64-linux-gnu compiled with C, fortran and ada support without any regression.
Is this ok for trunk?
Best regards,
Thomas
[-- Attachment #2: fix_retrival_testname.patch --]
[-- Type: text/x-patch, Size: 9186 bytes --]
diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index a66bb28253196410554405facefa8641d1020c1d..33286152f30df959a4bffa81634d0bfe7b898e8f 100644
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -78,7 +78,9 @@ proc dg-scan { name positive testcase output_file orig_args } {
proc scan-assembler { args } {
set testcase [testname-for-summary]
- set output_file "[file rootname [file tail $testcase]].s"
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
+ set output_file "[file rootname [file tail $filename]].s"
dg-scan "scan-assembler" 1 $testcase $output_file $args
}
@@ -89,7 +91,9 @@ force_conventional_output_for scan-assembler
proc scan-assembler-not { args } {
set testcase [testname-for-summary]
- set output_file "[file rootname [file tail $testcase]].s"
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
+ set output_file "[file rootname [file tail $filename]].s"
dg-scan "scan-assembler-not" 0 $testcase $output_file $args
}
@@ -117,7 +121,9 @@ proc hidden-scan-for { symbol } {
proc scan-hidden { args } {
set testcase [testname-for-summary]
- set output_file "[file rootname [file tail $testcase]].s"
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
+ set output_file "[file rootname [file tail $filename]].s"
set symbol [lindex $args 0]
@@ -133,7 +139,9 @@ proc scan-hidden { args } {
proc scan-not-hidden { args } {
set testcase [testname-for-summary]
- set output_file "[file rootname [file tail $testcase]].s"
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
+ set output_file "[file rootname [file tail $filename]].s"
set symbol [lindex $args 0]
set hidden_scan [hidden-scan-for $symbol]
@@ -163,7 +171,9 @@ proc scan-file-not { output_file args } {
proc scan-stack-usage { args } {
set testcase [testname-for-summary]
- set output_file "[file rootname [file tail $testcase]].su"
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
+ set output_file "[file rootname [file tail $filename]].su"
dg-scan "scan-file" 1 $testcase $output_file $args
}
@@ -173,7 +183,9 @@ proc scan-stack-usage { args } {
proc scan-stack-usage-not { args } {
set testcase [testname-for-summary]
- set output_file "[file rootname [file tail $testcase]].su"
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
+ set output_file "[file rootname [file tail $filename]].su"
dg-scan "scan-file-not" 0 $testcase $output_file $args
}
@@ -230,12 +242,14 @@ proc scan-assembler-times { args } {
}
set testcase [testname-for-summary]
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
set pattern [lindex $args 0]
set times [lindex $args 1]
set pp_pattern [make_pattern_printable $pattern]
# This must match the rule in gcc-dg.exp.
- set output_file "[file rootname [file tail $testcase]].s"
+ set output_file "[file rootname [file tail $filename]].s"
set files [glob -nocomplain $output_file]
if { $files == "" } {
@@ -292,9 +306,11 @@ proc scan-assembler-dem { args } {
}
set testcase [testname-for-summary]
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
set pattern [lindex $args 0]
set pp_pattern [make_pattern_printable $pattern]
- set output_file "[file rootname [file tail $testcase]].s"
+ set output_file "[file rootname [file tail $filename]].s"
set files [glob -nocomplain $output_file]
if { $files == "" } {
@@ -346,9 +362,11 @@ proc scan-assembler-dem-not { args } {
}
set testcase [testname-for-summary]
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
set pattern [lindex $args 0]
set pp_pattern [make_pattern_printable $pattern]
- set output_file "[file rootname [file tail $testcase]].s"
+ set output_file "[file rootname [file tail $filename]].s"
set files [glob -nocomplain $output_file]
if { $files == "" } {
@@ -401,6 +419,8 @@ proc object-size { args } {
}
set testcase [testname-for-summary]
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
set what [lindex $args 0]
set where [lsearch { text data bss total } $what]
if { $where == -1 } {
@@ -418,7 +438,7 @@ proc object-size { args } {
return
}
- set output_file "[file rootname [file tail $testcase]].o"
+ set output_file "[file rootname [file tail $filename]].o"
if ![file_on_host exists $output_file] {
verbose -log "$testcase: $output_file does not exist"
unresolved "$testcase object-size $what $cmp $with"
@@ -512,7 +532,9 @@ proc dg-function-on-line { args } {
proc scan-lto-assembler { args } {
set testcase [testname-for-summary]
- set output_file "[file rootname [file tail $testcase]].exe.ltrans0.s"
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
+ set output_file "[file rootname [file tail $filename]].exe.ltrans0.s"
verbose "output_file: $output_file"
dg-scan "scan-assembler" 1 $testcase $output_file $args
}
diff --git a/gcc/testsuite/lib/scandump.exp b/gcc/testsuite/lib/scandump.exp
index 4a64ac6e05ddfafb8c27d24e381e6e6dc53afe96..a2425a23c1e79103286250df353dab3e5eea622e 100644
--- a/gcc/testsuite/lib/scandump.exp
+++ b/gcc/testsuite/lib/scandump.exp
@@ -45,11 +45,13 @@ proc scan-dump { args } {
}
set testcase [testname-for-summary]
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
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 \"$printable_pattern\""
- set src [file tail [lindex $testcase 0]]
+ set src [file tail $filename]
set output_file "[glob -nocomplain $src.[lindex $args 2]]"
if { $output_file == "" } {
verbose -log "$testcase: dump file does not exist"
@@ -86,11 +88,13 @@ proc scan-dump-times { args } {
}
set testcase [testname-for-summary]
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
set times [lindex $args 2]
set suf [dump-suffix [lindex $args 3]]
set printable_pattern [make_pattern_printable [lindex $args 1]]
set testname "$testcase scan-[lindex $args 0]-dump-times $suf \"$printable_pattern\" [lindex $args 2]"
- set src [file tail [lindex $testcase 0]]
+ set src [file tail $filename]
set output_file "[glob -nocomplain $src.[lindex $args 3]]"
if { $output_file == "" } {
verbose -log "$testcase: dump file does not exist"
@@ -128,10 +132,12 @@ proc scan-dump-not { args } {
}
set testcase [testname-for-summary]
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
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 \"$printable_pattern\""
- set src [file tail [lindex $testcase 0]]
+ set src [file tail $filename]
set output_file "[glob -nocomplain $src.[lindex $args 2]]"
if { $output_file == "" } {
verbose -log "$testcase: dump file does not exist"
@@ -181,10 +187,12 @@ proc scan-dump-dem { args } {
}
set testcase [testname-for-summary]
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
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 \"$printable_pattern\""
- set src [file tail [lindex $testcase 0]]
+ set src [file tail $filename]
set output_file "[glob -nocomplain $src.[lindex $args 2]]"
if { $output_file == "" } {
verbose -log "$testcase: dump file does not exist"
@@ -233,10 +241,12 @@ proc scan-dump-dem-not { args } {
}
set testcase [testname-for-summary]
+ # The name might include a list of options; extract the file name.
+ set filename [lindex $testcase 0]
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 \"$printable_pattern\""
- set src [file tail [lindex $testcase 0]]
+ set src [file tail $filename]
set output_file "[glob -nocomplain $src.[lindex $args 2]]"
if { $output_file == "" } {
verbose -log "$testcase: dump file does not exist"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH, GCC/testsuite] Fix retrieval of testname
2017-11-09 18:05 [PATCH, GCC/testsuite] Fix retrieval of testname Thomas Preudhomme
@ 2017-11-09 19:04 ` Mike Stump
0 siblings, 0 replies; 2+ messages in thread
From: Mike Stump @ 2017-11-09 19:04 UTC (permalink / raw)
To: Thomas Preudhomme; +Cc: Rainer Orth, gcc-patches
On Nov 9, 2017, at 10:00 AM, Thomas Preudhomme <thomas.preudhomme@foss.arm.com> wrote:
>
> When gcc-dg-runtest is used to run a test the test is run several times
> with different options. For clarity of the log, the test infrastructure
> then append the options to the testname. This means that all the code
> that must deal with the testcase itself (eg. removing the output files
> after the test has run) needs to remove the option name.
> Is this ok for trunk?
Ok. Little scary the code is repeated so many time. If someone wants to refactor it some, I could see the beauty in that.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-09 18:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-09 18:05 [PATCH, GCC/testsuite] Fix retrieval of testname Thomas Preudhomme
2017-11-09 19:04 ` Mike Stump
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).