2006-02-08 Paolo Bonzini <bonzini@gnu.org>

	* lib/scantree.exp (scan-tree-dump, scan-tree-dump-times,
	scan-tree-dump-not, scan-tree-dump-dem): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110755 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9276275..4d6908f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-08  Paolo Bonzini  <bonzini@gnu.org>
+
+       * lib/scantree.exp (scan-tree-dump, scan-tree-dump-times,
+       scan-tree-dump-not, scan-tree-dump-dem): Likewise.
+
+2006-02-08  Paolo Bonzini  <bonzini@gnu.org>
+
+       * lib/scanrtl.exp: New.
+
 2006-02-08  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        PR c++/26071
@@ -8,14 +17,8 @@
 
 2006-02-08  Paolo Bonzini  <bonzini@gnu.org>
 
-       * lib/scanrtl.exp: New.
-
-2006-02-08  Paolo Bonzini  <bonzini@gnu.org>
-
        * lib/gcc-dg.exp (cleanup-rtl-dump, cleanup-tree-dump,
        cleanup-ipa-dump): Update dump file glob patterns.
-       * lib/scantree.exp (scan-tree-dump, scan-tree-dump-times,
-       scan-tree-dump-not, scan-tree-dump-dem): Likewise.
        * lib/scanipa.exp (scan-ipa-dump, scan-ipa-dump-times,
        scan-ipa-dump-not, scan-ipa-dump-dem): Likewise.
 

diff --git a/gcc/testsuite/lib/scantree.exp b/gcc/testsuite/lib/scantree.exp
index 7bbd2c6..d7db64e 100644 (file)
--- a/gcc/testsuite/lib/scantree.exp
+++ b/gcc/testsuite/lib/scantree.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 2000, 2002, 2003, 2005 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,9 +36,9 @@ proc scan-tree-dump { args } {
        return
     }
     if { [llength $args] >= 3 } {
-       scan-dump "tree" [lindex $args 0] "t\[0-9\]\*.[lindex $args 1]" [lindex $args 2]
+       scan-dump "tree" [lindex $args 0] "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" [lindex $args 2]
     } else {
-       scan-dump "tree" [lindex $args 0] "t\[0-9\]\*.[lindex $args 1]"
+       scan-dump "tree" [lindex $args 0] "\[0-9\]\[0-9\]\[0-9\]t.[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\]\*.[lindex $args 2]" [lindex $args 3]
+                       "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 2]" [lindex $args 3]
     } else {
        scan-dump-times "tree" [lindex $args 0] [lindex $args 1] \
-                       "t\[0-9\]\*.[lindex $args 2]"
+                       "\[0-9\]\[0-9\]\[0-9\]t.[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\]\*.[lindex $args 1]" [lindex $args 2]
+                     "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" [lindex $args 2]
     } else {
        scan-dump-not "tree" [lindex $args 0] \
-                     "t\[0-9\]\*.[lindex $args 1]"
+                     "\[0-9\]\[0-9\]\[0-9\]t.[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\]\*.[lindex $args 1]" [lindex $args 2]
+                     "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" [lindex $args 2]
     } else {
        scan-dump-dem "tree" [lindex $args 0] \
-                     "t\[0-9\]\*.[lindex $args 1]"
+                     "\[0-9\]\[0-9\]\[0-9\]t.[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\]\*.[lindex $args 1]" \
+                         "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" \
                          [lindex $args 2]
     } else {
        scan-dump-dem-not "tree" [lindex $args 0] \
-                         "t\[0-9\]\*.[lindex $args 1]"
+                         "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]"
     }
 }