diff options
author | Janis Johnson <janis187@us.ibm.com> | 2005-03-31 00:28:49 +0000 |
---|---|---|
committer | Janis Johnson <janis@gcc.gnu.org> | 2005-03-31 00:28:49 +0000 |
commit | 408e9b9b233930342d799237b3ef855176acfe4b (patch) | |
tree | c51e673166a95880eae5f1f24af34e4bc5d6d58b /gcc | |
parent | eb91632ffbd373bc97207d8d8554c9f8a37df6f1 (diff) | |
download | gcc-408e9b9b233930342d799237b3ef855176acfe4b.zip gcc-408e9b9b233930342d799237b3ef855176acfe4b.tar.gz gcc-408e9b9b233930342d799237b3ef855176acfe4b.tar.bz2 |
scantree.exp (scan-tree-dump, [...]): Strip options from test name.
* lib/scantree.exp (scan-tree-dump, scan-tree-dump-times,
scan-tree-dump-not, scan-tree-dump-dem, scan-tree-dump-dem-not):
Strip options from test name.
From-SVN: r97298
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/testsuite/lib/scantree.exp | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 411540f..0dad075 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2005-03-30 Janis Johnson <janis187@us.ibm.com> + + * lib/scantree.exp (scan-tree-dump, scan-tree-dump-times, + scan-tree-dump-not, scan-tree-dump-dem, scan-tree-dump-dem-not): + Strip options from test name. + 2005-03-31 Jan Hubicka <jh@suse.cz> * gcc.dg/varpool-1.c: New testcase. diff --git a/gcc/testsuite/lib/scantree.exp b/gcc/testsuite/lib/scantree.exp index 76d1a59..935e068 100644 --- a/gcc/testsuite/lib/scantree.exp +++ b/gcc/testsuite/lib/scantree.exp @@ -49,7 +49,8 @@ proc scan-tree-dump { args } { upvar 2 name testcase # This must match the rule in gcc-dg.exp. - set output_file "[glob [file tail $testcase].t??.[lindex $args 1]]" + set src [file tail [lindex $testcase 0]] + set output_file "[glob $src.t??.[lindex $args 1]]" set fd [open $output_file r] set text [read $fd] @@ -91,7 +92,8 @@ proc scan-tree-dump-times { args } { upvar 2 name testcase # This must match the rule in gcc-dg.exp. - set output_file "[glob [file tail $testcase].t??.[lindex $args 2]]" + set src [file tail [lindex $testcase 0]] + set output_file "[glob $src.t??.[lindex $args 2]]" set fd [open $output_file r] set text [read $fd] @@ -128,7 +130,8 @@ proc scan-tree-dump-not { args } { } upvar 2 name testcase - set output_file "[glob [file tail $testcase].t??.[lindex $args 1]]" + set src [file tail [lindex $testcase 0]] + set output_file "[glob $src.t??.[lindex $args 1]]" set fd [open $output_file r] set text [read $fd] @@ -179,7 +182,8 @@ proc scan-tree-dump-dem { args } { } upvar 2 name testcase - set output_file "[glob [file tail $testcase].t??.[lindex $args 1]]" + set src [file tail [lindex $testcase 0]] + set output_file "[glob $src.t??.[lindex $args 1]]" set fd [open "| $cxxfilt < $output_file" r] set text [read $fd] @@ -229,7 +233,8 @@ proc scan-tree-dump-dem-not { args } { } upvar 2 name testcase - set output_file "[glob [file tail $testcase].t??.[lindex $args 1]]" + set src [file tail [lindex $testcase 0]] + set output_file "[glob $src.t??.[lindex $args 1]]" set fd [open "| $cxxfilt < $output_file" r] set text [read $fd] |