diff options
Diffstat (limited to 'gcc/testsuite/lib/scantree.exp')
| -rw-r--r-- | gcc/testsuite/lib/scantree.exp | 187 |
1 files changed, 40 insertions, 147 deletions
diff --git a/gcc/testsuite/lib/scantree.exp b/gcc/testsuite/lib/scantree.exp index 281cf4232d8..d0f57969b97 100644 --- a/gcc/testsuite/lib/scantree.exp +++ b/gcc/testsuite/lib/scantree.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002, 2003, 2005 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 @@ -16,233 +16,126 @@ # Various utilities for scanning tree dump output, used by gcc-dg.exp and # g++-dg.exp. -# -# This is largely borrowed from scanasm.exp. + +load_lib scandump.exp # Utility for scanning compiler result, invoked via dg-final. # Call pass if pattern is present, otherwise fail. # -# Argument 0 is the regexp to match. -# Argument 1 is the suffix for the tree dump file +# Argument 0 is the regexp to match +# Argument 1 is the name of the dumped tree pass # Argument 2 handles expected failures and the like proc scan-tree-dump { args } { + if { [llength $args] < 2 } { error "scan-tree-dump: too few arguments" - return + return } if { [llength $args] > 3 } { error "scan-tree-dump: too many arguments" return } if { [llength $args] >= 3 } { - switch [dg-process-target [lindex $args 2]] { - "S" { } - "N" { return } - "F" { setup_xfail "*-*-*" } - "P" { } - } - } - - # This assumes that we are two frames down from dg-test, and that - # it still stores the filename of the testcase in a local variable "name". - # A cleaner solution would require a new dejagnu release. - upvar 2 name testcase - - # This must match the rule in gcc-dg.exp. - 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] - close $fd - - if [regexp -- [lindex $args 0] $text] { - pass "$testcase scan-tree-dump [lindex $args 0]" + scan-dump "tree" [lindex $args 0] "t\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2] } else { - fail "$testcase scan-tree-dump [lindex $args 0]" + scan-dump "tree" [lindex $args 0] "t\[0-9\]\[0-9\].[lindex $args 1]" } } # Call pass if pattern is present given number of times, otherwise fail. -# Argument 0 is the regexp to match. +# Argument 0 is the regexp to match # Argument 1 is number of times the regexp must be found -# Argument 2 is the suffix for the tree dump file +# Argument 2 is the name of the dumped tree pass # Argument 3 handles expected failures and the like proc scan-tree-dump-times { args } { + if { [llength $args] < 3 } { error "scan-tree-dump: too few arguments" - return + return } if { [llength $args] > 4 } { error "scan-tree-dump: too many arguments" return } if { [llength $args] >= 4 } { - switch [dg-process-target [lindex $args 3]] { - "S" { } - "N" { return } - "F" { setup_xfail "*-*-*" } - "P" { } - } - } - - # This assumes that we are two frames down from dg-test, and that - # it still stores the filename of the testcase in a local variable "name". - # A cleaner solution would require a new dejagnu release. - upvar 2 name testcase - - # This must match the rule in gcc-dg.exp. - 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] - close $fd - - if { [llength [regexp -inline -all -- [lindex $args 0] $text]] == [lindex $args 1]} { - pass "$testcase scan-tree-dump-times [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] } else { - fail "$testcase scan-tree-dump-times [lindex $args 0] [lindex $args 1]" + scan-dump-times "tree" [lindex $args 0] [lindex $args 1] \ + "t\[0-9\]\[0-9\].[lindex $args 2]" } } # Call pass if pattern is not present, otherwise fail. # -# Argument 0 is the regexp to match. -# Argument 1 is the suffix for the tree dump file +# Argument 0 is the regexp to match +# Argument 1 is the name of the dumped tree pass # Argument 2 handles expected failures and the like proc scan-tree-dump-not { args } { + if { [llength $args] < 2 } { error "scan-tree-dump-not: too few arguments" - return + return } if { [llength $args] > 3 } { error "scan-tree-dump-not: too many arguments" return } if { [llength $args] >= 3 } { - switch [dg-process-target [lindex $args 2]] { - "S" { } - "N" { return } - "F" { setup_xfail "*-*-*" } - "P" { } - } - } - - upvar 2 name testcase - 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] - close $fd - - if ![regexp -- [lindex $args 0] $text] { - pass "$testcase scan-tree-dump-not [lindex $args 0]" + scan-dump-not "tree" [lindex $args 0] \ + "t\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2] } else { - fail "$testcase scan-tree-dump-not [lindex $args 0]" + scan-dump-not "tree" [lindex $args 0] \ + "t\[0-9\]\[0-9\].[lindex $args 1]" } } # Utility for scanning demangled compiler result, invoked via dg-final. # Call pass if pattern is present, otherwise fail. # -# Argument 0 is the regexp to match. -# Argument 1 is the suffix for the tree dump file +# Argument 0 is the regexp to match +# Argument 1 is the name of the dumped tree pass # Argument 2 handles expected failures and the like proc scan-tree-dump-dem { args } { - global cxxfilt - global base_dir if { [llength $args] < 2 } { error "scan-tree-dump-dem: too few arguments" - return + return } if { [llength $args] > 3 } { error "scan-tree-dump-dem: too many arguments" return } if { [llength $args] >= 3 } { - switch [dg-process-target [lindex $args 2]] { - "S" { } - "N" { return } - "F" { setup_xfail "*-*-*" } - "P" { } - } - } - - # Find c++filt like we find g++ in g++.exp. - if ![info exists cxxfilt] { - set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \ - $base_dir/../../binutils/cxxfilt \ - [findfile $base_dir/../c++filt $base_dir/../c++filt \ - [findfile $base_dir/c++filt $base_dir/c++filt \ - [transform c++filt]]]] - verbose -log "c++filt is $cxxfilt" - } - - upvar 2 name testcase - 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] - close $fd - - if [regexp -- [lindex $args 0] $text] { - pass "$testcase scan-tree-dump-dem [lindex $args 0]" + scan-dump-dem "tree" [lindex $args 0] \ + "t\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2] } else { - fail "$testcase scan-tree-dump-dem [lindex $args 0]" + scan-dump-dem "tree" [lindex $args 0] \ + "t\[0-9\]\[0-9\].[lindex $args 1]" } } # Call pass if demangled pattern is not present, otherwise fail. # -# Argument 0 is the regexp to match. -# Argument 1 is the suffix for the tree dump file +# Argument 0 is the regexp to match +# Argument 1 is the name of the dumped tree pass # Argument 2 handles expected failures and the like proc scan-tree-dump-dem-not { args } { - global cxxfilt - global base_dir if { [llength $args] < 2 } { error "scan-tree-dump-dem-not: too few arguments" - return + return } if { [llength $args] > 3 } { error "scan-tree-dump-dem-not: too many arguments" return } if { [llength $args] >= 3 } { - switch [dg-process-target [lindex $args 2]] { - "S" { } - "N" { return } - "F" { setup_xfail "*-*-*" } - "P" { } - } - } - - # Find c++filt like we find g++ in g++.exp. - if ![info exists cxxfilt] { - set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \ - $base_dir/../../binutils/cxxfilt \ - [findfile $base_dir/../c++filt $base_dir/../c++filt \ - [findfile $base_dir/c++filt $base_dir/c++filt \ - [transform c++filt]]]] - verbose -log "c++filt is $cxxfilt" - } - - upvar 2 name testcase - 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] - close $fd - - if ![regexp -- [lindex $args 0] $text] { - pass "$testcase scan-tree-dump-dem-not [lindex $args 0]" + scan-dump-dem-not "tree" [lindex $args 0] \ + "t\[0-9\]\[0-9\].[lindex $args 1]" \ + [lindex $args 2] } else { - fail "$testcase scan-tree-dump-dem-not [lindex $args 0]" + scan-dump-dem-not "tree" [lindex $args 0] \ + "t\[0-9\]\[0-9\].[lindex $args 1]" } } |