-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002 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
# Utility for scanning compiler result, invoked via dg-final.
# Call pass if pattern is present, otherwise fail.
-proc scan-assembler { pattern args } {
+proc scan-assembler { args } {
+ if { [llength $args] < 1 } {
+ error "scan-assembler: too few arguments"
+ return
+ }
+ if { [llength $args] > 2 } {
+ error "scan-assembler: too many arguments"
+ return
+ }
+ if { [llength $args] >= 2 } {
+ switch [dg-process-target [lindex $args 1]] {
+ "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.
- set testcase [uplevel 2 { expr { $name } }]
+ upvar 2 name testcase
# This must match the rule in gcc-dg.exp.
set output_file "[file rootname [file tail $testcase]].s"
set text [read $fd]
close $fd
- set vmessage [concat $args]
- if { $vmessage == ""} {
- set vmessage $pattern
+ if [regexp -- [lindex $args 0] $text] {
+ pass "$testcase scan-assembler [lindex $args 0]"
+ } else {
+ fail "$testcase scan-assembler [lindex $args 0]"
+ }
+}
+
+# Call pass if pattern is present given number of times, otherwise fail.
+proc scan-assembler-times { args } {
+ if { [llength $args] < 2 } {
+ error "scan-assembler: too few arguments"
+ return
+ }
+ if { [llength $args] > 3 } {
+ error "scan-assembler: too many arguments"
+ return
+ }
+ if { [llength $args] >= 3 } {
+ switch [dg-process-target [lindex $args 2]] {
+ "S" { }
+ "N" { return }
+ "F" { setup_xfail "*-*-*" }
+ "P" { }
+ }
}
- if [regexp -- $pattern $text] {
- pass "$testcase scan-assembler $vmessage"
+ # 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 output_file "[file rootname [file tail $testcase]].s"
+
+ 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-assembler-times [lindex $args 0] [lindex $args 1]"
} else {
- fail "$testcase scan-assembler $vmessage"
+ fail "$testcase scan-assembler-times [lindex $args 0] [lindex $args 1]"
}
}
# Call pass if pattern is not present, otherwise fail.
-proc scan-assembler-not { pattern args } {
- set testcase [uplevel 2 { expr { $name } }]
+proc scan-assembler-not { args } {
+ if { [llength $args] < 1 } {
+ error "scan-assembler-not: too few arguments"
+ return
+ }
+ if { [llength $args] > 2 } {
+ error "scan-assembler-not: too many arguments"
+ return
+ }
+ if { [llength $args] >= 2 } {
+ switch [dg-process-target [lindex $args 1]] {
+ "S" { }
+ "N" { return }
+ "F" { setup_xfail "*-*-*" }
+ "P" { }
+ }
+ }
+
+ upvar 2 name testcase
set output_file "[file rootname [file tail $testcase]].s"
set fd [open $output_file r]
set text [read $fd]
close $fd
- set vmessage [concat $args]
- if { $vmessage == ""} {
- set vmessage $pattern
- }
-
- if ![regexp -- $pattern $text] {
- pass "$testcase scan-assembler-not $vmessage"
+ if ![regexp -- [lindex $args 0] $text] {
+ pass "$testcase scan-assembler-not [lindex $args 0]"
} else {
- fail "$testcase scan-assembler-not $vmessage"
+ fail "$testcase scan-assembler-not [lindex $args 0]"
}
}
# Utility for scanning demangled compiler result, invoked via dg-final.
# Call pass if pattern is present, otherwise fail.
-proc scan-assembler-dem { pattern args } {
+proc scan-assembler-dem { args } {
global cxxfilt
global base_dir
+ if { [llength $args] < 1 } {
+ error "scan-assembler-dem: too few arguments"
+ return
+ }
+ if { [llength $args] > 2 } {
+ error "scan-assembler-dem: too many arguments"
+ return
+ }
+ if { [llength $args] >= 2 } {
+ switch [dg-process-target [lindex $args 1]] {
+ "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/../c++filt $base_dir/../c++filt \
- [findfile $base_dir/c++filt $base_dir/c++filt \
- [transform c++filt]]]
+ 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"
}
- set testcase [uplevel 2 { expr { $name } }]
+ upvar 2 name testcase
set output_file "[file rootname [file tail $testcase]].s"
set fd [open "| $cxxfilt < $output_file" r]
set text [read $fd]
close $fd
- set vmessage [concat $args]
- if { $vmessage == ""} {
- set vmessage $pattern
- }
-
- if [regexp -- $pattern $text] {
- pass "$testcase scan-assembler $vmessage"
+ if [regexp -- [lindex $args 0] $text] {
+ pass "$testcase scan-assembler-dem [lindex $args 0]"
} else {
- fail "$testcase scan-assembler $vmessage"
+ fail "$testcase scan-assembler-dem [lindex $args 0]"
}
}
# Call pass if demangled pattern is not present, otherwise fail.
-proc scan-assembler-dem-not { pattern args } {
+proc scan-assembler-dem-not { args } {
global cxxfilt
global base_dir
+ if { [llength $args] < 1 } {
+ error "scan-assembler-dem-not: too few arguments"
+ return
+ }
+ if { [llength $args] > 2 } {
+ error "scan-assembler-dem-not: too many arguments"
+ return
+ }
+ if { [llength $args] >= 2 } {
+ switch [dg-process-target [lindex $args 1]] {
+ "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/../c++filt $base_dir/../c++filt \
- [findfile $base_dir/c++filt $base_dir/c++filt \
- [transform c++filt]]]
+ 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"
}
- set testcase [uplevel 2 { expr { $name } }]
+ upvar 2 name testcase
set output_file "[file rootname [file tail $testcase]].s"
set fd [open "| $cxxfilt < $output_file" r]
set text [read $fd]
close $fd
- set vmessage [concat $args]
- if { $vmessage == ""} {
- set vmessage $pattern
- }
-
- if ![regexp -- $pattern $text] {
- pass "$testcase scan-assembler-not $vmessage"
+ if ![regexp -- [lindex $args 0] $text] {
+ pass "$testcase scan-assembler-dem-not [lindex $args 0]"
} else {
- fail "$testcase scan-assembler-not $vmessage"
+ fail "$testcase scan-assembler-dem-not [lindex $args 0]"
}
}
OSDN Git Service
