Skip to content

R
riscv-gcc-1
Commit c57bf621 by Jeff Law Committed by Jeff Law
Options

gcc-dg.exp (cleanup-rtl-dump): Fix dump file regexp to handle more than 100 dump files. 


	* lib/gcc-dg.exp (cleanup-rtl-dump): Fix dump file regexp to
	handle more than 100 dump files.
	(cleanup-tree-dump, cleanup-ipa-dump): Likewise.
	* lib/scantree.exp (scan-tree-dump): Likewise.
	(scan-tree-dump-times, scan-tree-dump-not): Likewise.
	(scan-tree-dump-dem, scan-tree-dump-dem-not): Likewise.
	* lib/scanipa.exp (scan-ipa-dump): Likewise.
	(scan-ipa-dump-times, scan-ipa-dump-not): Likewise.
	(scan-ipa-dump-dem, scan-ipa-dump-dem-not): Likewise.

From-SVN: r110553
parent f05ee80c
Showing with 35 additions and 23 deletions
gcc/testsuite/ChangeLog
2006-02-03 Jeff Law <law@redhat.com>
* lib/gcc-dg.exp (cleanup-rtl-dump): Fix dump file regexp to
handle more than 100 dump files.
(cleanup-tree-dump, cleanup-ipa-dump): Likewise.
* lib/scantree.exp (scan-tree-dump): Likewise.
(scan-tree-dump-times, scan-tree-dump-not): Likewise.
(scan-tree-dump-dem, scan-tree-dump-dem-not): Likewise.
* lib/scanipa.exp (scan-ipa-dump): Likewise.
(scan-ipa-dump-times, scan-ipa-dump-not): Likewise.
(scan-ipa-dump-dem, scan-ipa-dump-dem-not): Likewise.
2006-02-03 Diego Novillo <dnovillo@redhat.com> 2006-02-03 Diego Novillo <dnovillo@redhat.com>
* gcc.dg/gomp/pr25990.c: Replace with pre-processed version. * gcc.dg/gomp/pr25990.c: Replace with pre-processed version.
gcc/testsuite/lib/gcc-dg.exp
...@@ -344,21 +344,21 @@ proc cleanup-repo-files { } { ...@@ -344,21 +344,21 @@ proc cleanup-repo-files { } {
# #
# SUFFIX is the filename suffix pattern. # SUFFIX is the filename suffix pattern.
proc cleanup-rtl-dump { suffix } { proc cleanup-rtl-dump { suffix } {
cleanup-dump "\[0-9\]\[0-9\].$suffix" cleanup-dump "\[0-9\]\*.$suffix"
} }
# Remove a specific tree dump file for the current test. # Remove a specific tree dump file for the current test.
# #
# SUFFIX is the tree dump file suffix pattern. # SUFFIX is the tree dump file suffix pattern.
proc cleanup-tree-dump { suffix } { proc cleanup-tree-dump { suffix } {
cleanup-dump "t\[0-9\]\[0-9\].$suffix" cleanup-dump "t\[0-9\]\*.$suffix"
} }
# Remove a specific ipa dump file for the current test. # Remove a specific ipa dump file for the current test.
# #
# SUFFIX is the ipa dump file suffix pattern. # SUFFIX is the ipa dump file suffix pattern.
proc cleanup-ipa-dump { suffix } { proc cleanup-ipa-dump { suffix } {
cleanup-dump "i\[0-9\]\[0-9\].$suffix" cleanup-dump "i\[0-9\]\*.$suffix"
} }
# Remove all dump files with the provided suffix. # Remove all dump files with the provided suffix.
......
gcc/testsuite/lib/scanipa.exp
...@@ -36,9 +36,9 @@ proc scan-ipa-dump { args } { ...@@ -36,9 +36,9 @@ proc scan-ipa-dump { args } {
return return
} }
if { [llength $args] >= 3 } { if { [llength $args] >= 3 } {
scan-dump "ipa" [lindex $args 0] "i\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2] scan-dump "ipa" [lindex $args 0] "i\[0-9\]\*.[lindex $args 1]" [lindex $args 2]
} else { } else {
scan-dump "ipa" [lindex $args 0] "i\[0-9\]\[0-9\].[lindex $args 1]" scan-dump "ipa" [lindex $args 0] "i\[0-9\]\*.[lindex $args 1]"
} }
} }
...@@ -59,10 +59,10 @@ proc scan-ipa-dump-times { args } { ...@@ -59,10 +59,10 @@ proc scan-ipa-dump-times { args } {
} }
if { [llength $args] >= 4 } { if { [llength $args] >= 4 } {
scan-dump-times "ipa" [lindex $args 0] [lindex $args 1] \ scan-dump-times "ipa" [lindex $args 0] [lindex $args 1] \
"i\[0-9\]\[0-9\].[lindex $args 2]" [lindex $args 3] "i\[0-9\]\*.[lindex $args 2]" [lindex $args 3]
} else { } else {
scan-dump-times "ipa" [lindex $args 0] [lindex $args 1] \ scan-dump-times "ipa" [lindex $args 0] [lindex $args 1] \
"i\[0-9\]\[0-9\].[lindex $args 2]" "i\[0-9\]\*.[lindex $args 2]"
} }
} }
...@@ -83,10 +83,10 @@ proc scan-ipa-dump-not { args } { ...@@ -83,10 +83,10 @@ proc scan-ipa-dump-not { args } {
} }
if { [llength $args] >= 3 } { if { [llength $args] >= 3 } {
scan-dump-not "ipa" [lindex $args 0] \ scan-dump-not "ipa" [lindex $args 0] \
"i\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2] "i\[0-9\]\*.[lindex $args 1]" [lindex $args 2]
} else { } else {
scan-dump-not "ipa" [lindex $args 0] \ scan-dump-not "ipa" [lindex $args 0] \
"i\[0-9\]\[0-9\].[lindex $args 1]" "i\[0-9\]\*.[lindex $args 1]"
} }
} }
...@@ -108,10 +108,10 @@ proc scan-ipa-dump-dem { args } { ...@@ -108,10 +108,10 @@ proc scan-ipa-dump-dem { args } {
} }
if { [llength $args] >= 3 } { if { [llength $args] >= 3 } {
scan-dump-dem "ipa" [lindex $args 0] \ scan-dump-dem "ipa" [lindex $args 0] \
"i\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2] "i\[0-9\]\*.[lindex $args 1]" [lindex $args 2]
} else { } else {
scan-dump-dem "ipa" [lindex $args 0] \ scan-dump-dem "ipa" [lindex $args 0] \
"i\[0-9\]\[0-9\].[lindex $args 1]" "i\[0-9\]\*.[lindex $args 1]"
} }
} }
...@@ -132,10 +132,10 @@ proc scan-ipa-dump-dem-not { args } { ...@@ -132,10 +132,10 @@ proc scan-ipa-dump-dem-not { args } {
} }
if { [llength $args] >= 3 } { if { [llength $args] >= 3 } {
scan-dump-dem-not "ipa" [lindex $args 0] \ scan-dump-dem-not "ipa" [lindex $args 0] \
"i\[0-9\]\[0-9\].[lindex $args 1]" \ "i\[0-9\]\*.[lindex $args 1]" \
[lindex $args 2] [lindex $args 2]
} else { } else {
scan-dump-dem-not "ipa" [lindex $args 0] \ scan-dump-dem-not "ipa" [lindex $args 0] \
"i\[0-9\]\[0-9\].[lindex $args 1]" "i\[0-9\]\*.[lindex $args 1]"
} }
} }
gcc/testsuite/lib/scantree.exp
...@@ -36,9 +36,9 @@ proc scan-tree-dump { args } { ...@@ -36,9 +36,9 @@ proc scan-tree-dump { args } {
return return
} }
if { [llength $args] >= 3 } { if { [llength $args] >= 3 } {
scan-dump "tree" [lindex $args 0] "t\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2] scan-dump "tree" [lindex $args 0] "t\[0-9\]\*.[lindex $args 1]" [lindex $args 2]
} else { } else {
scan-dump "tree" [lindex $args 0] "t\[0-9\]\[0-9\].[lindex $args 1]" scan-dump "tree" [lindex $args 0] "t\[0-9\]\*.[lindex $args 1]"
} }
} }
...@@ -59,10 +59,10 @@ proc scan-tree-dump-times { args } { ...@@ -59,10 +59,10 @@ proc scan-tree-dump-times { args } {
} }
if { [llength $args] >= 4 } { if { [llength $args] >= 4 } {
scan-dump-times "tree" [lindex $args 0] [lindex $args 1] \ scan-dump-times "tree" [lindex $args 0] [lindex $args 1] \
"t\[0-9\]\[0-9\].[lindex $args 2]" [lindex $args 3] "t\[0-9\]\*.[lindex $args 2]" [lindex $args 3]
} else { } else {
scan-dump-times "tree" [lindex $args 0] [lindex $args 1] \ scan-dump-times "tree" [lindex $args 0] [lindex $args 1] \
"t\[0-9\]\[0-9\].[lindex $args 2]" "t\[0-9\]\*.[lindex $args 2]"
} }
} }
...@@ -83,10 +83,10 @@ proc scan-tree-dump-not { args } { ...@@ -83,10 +83,10 @@ proc scan-tree-dump-not { args } {
} }
if { [llength $args] >= 3 } { if { [llength $args] >= 3 } {
scan-dump-not "tree" [lindex $args 0] \ scan-dump-not "tree" [lindex $args 0] \
"t\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2] "t\[0-9\]\*.[lindex $args 1]" [lindex $args 2]
} else { } else {
scan-dump-not "tree" [lindex $args 0] \ scan-dump-not "tree" [lindex $args 0] \
"t\[0-9\]\[0-9\].[lindex $args 1]" "t\[0-9\]\*.[lindex $args 1]"
} }
} }
...@@ -108,10 +108,10 @@ proc scan-tree-dump-dem { args } { ...@@ -108,10 +108,10 @@ proc scan-tree-dump-dem { args } {
} }
if { [llength $args] >= 3 } { if { [llength $args] >= 3 } {
scan-dump-dem "tree" [lindex $args 0] \ scan-dump-dem "tree" [lindex $args 0] \
"t\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2] "t\[0-9\]\*.[lindex $args 1]" [lindex $args 2]
} else { } else {
scan-dump-dem "tree" [lindex $args 0] \ scan-dump-dem "tree" [lindex $args 0] \
"t\[0-9\]\[0-9\].[lindex $args 1]" "t\[0-9\]\*.[lindex $args 1]"
} }
} }
...@@ -132,10 +132,10 @@ proc scan-tree-dump-dem-not { args } { ...@@ -132,10 +132,10 @@ proc scan-tree-dump-dem-not { args } {
} }
if { [llength $args] >= 3 } { if { [llength $args] >= 3 } {
scan-dump-dem-not "tree" [lindex $args 0] \ scan-dump-dem-not "tree" [lindex $args 0] \
"t\[0-9\]\[0-9\].[lindex $args 1]" \ "t\[0-9\]\*.[lindex $args 1]" \
[lindex $args 2] [lindex $args 2]
} else { } else {
scan-dump-dem-not "tree" [lindex $args 0] \ scan-dump-dem-not "tree" [lindex $args 0] \
"t\[0-9\]\[0-9\].[lindex $args 1]" "t\[0-9\]\*.[lindex $args 1]"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment