From 961ee3ff391d899e4cfd940da3a75dbd2ecb0d1f Mon Sep 17 00:00:00 2001 From: law Date: Fri, 3 Feb 2006 19:06:30 +0000 Subject: [PATCH] * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110553 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 12 ++++++++++++ gcc/testsuite/lib/gcc-dg.exp | 6 +++--- gcc/testsuite/lib/scanipa.exp | 20 ++++++++++---------- gcc/testsuite/lib/scantree.exp | 20 ++++++++++---------- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3852960afa3..416187f5855 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2006-02-03 Jeff Law + + * 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 * gcc.dg/gomp/pr25990.c: Replace with pre-processed version. diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 6fb94e01ec7..6a228811dd4 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -344,21 +344,21 @@ proc cleanup-repo-files { } { # # SUFFIX is the filename suffix pattern. 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. # # SUFFIX is the tree dump file suffix pattern. 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. # # SUFFIX is the ipa dump file suffix pattern. 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. diff --git a/gcc/testsuite/lib/scanipa.exp b/gcc/testsuite/lib/scanipa.exp index 97688a9c78f..7f9c0316de4 100644 --- a/gcc/testsuite/lib/scanipa.exp +++ b/gcc/testsuite/lib/scanipa.exp @@ -36,9 +36,9 @@ proc scan-ipa-dump { args } { return } 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 { - 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 } { } if { [llength $args] >= 4 } { 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 { 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 } { } if { [llength $args] >= 3 } { 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 { 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 } { } if { [llength $args] >= 3 } { 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 { 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 } { } if { [llength $args] >= 3 } { 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] } else { scan-dump-dem-not "ipa" [lindex $args 0] \ - "i\[0-9\]\[0-9\].[lindex $args 1]" + "i\[0-9\]\*.[lindex $args 1]" } } diff --git a/gcc/testsuite/lib/scantree.exp b/gcc/testsuite/lib/scantree.exp index d0f57969b97..7bbd2c6b404 100644 --- a/gcc/testsuite/lib/scantree.exp +++ b/gcc/testsuite/lib/scantree.exp @@ -36,9 +36,9 @@ proc scan-tree-dump { args } { return } 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 { - 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 } { } if { [llength $args] >= 4 } { 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 { 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 } { } if { [llength $args] >= 3 } { 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 { 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 } { } if { [llength $args] >= 3 } { 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 { 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 } { } if { [llength $args] >= 3 } { 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] } else { scan-dump-dem-not "tree" [lindex $args 0] \ - "t\[0-9\]\[0-9\].[lindex $args 1]" + "t\[0-9\]\*.[lindex $args 1]" } } -- 2.11.0