mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-01 20:21:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

scandump.exp (scan-dump): Handle non-existent dump file.

Browse Source 
* lib/scandump.exp (scan-dump): Handle non-existent dump file.
	(scan-dump-times): Ditto.
	(scan-dump-not): Ditto.
	(scan-dump-dem): Ditto.
	(scan-dump-dem-not): Ditto.

From-SVN: r135690
This commit is contained in:
Janis Johnson 2008-05-20 23:29:56 +00:00 committed by Janis Johnson
parent 8a93eaf25e
commit 66d0be855a
2 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,11 @@
2008-05-20 Janis Johnson <janis187@us.ibm.com>
* lib/scandump.exp (scan-dump): Handle non-existent dump file.
(scan-dump-times): Ditto.
(scan-dump-not): Ditto.
(scan-dump-dem): Ditto.
(scan-dump-dem-not): Ditto.
* obj-c++.dg/bitfield-1.mm: XFAIL for ICE; move dg-options after other
test directives; use dg-prune-output instead of dg-excess-errors for
possible message to ignore; adjust line numbers for messages.

67
gcc/testsuite/lib/scandump.exp
View File

@ -49,18 +49,23 @@ proc scan-dump { args } {
# A cleaner solution would require a new DejaGnu release.
upvar 3 name testcase
set suf [dump-suffix [lindex $args 2]]
set testname "$testcase scan-[lindex $args 0]-dump $suf \"[lindex $args 1]\""
set src [file tail [lindex $testcase 0]]
set output_file "[glob $src.[lindex $args 2]]"
set output_file "[glob -nocomplain $src.[lindex $args 2]]"
if { $output_file == "" } {
fail "$testname: dump file does not exist"
return
}
set fd [open $output_file r]
set text [read $fd]
close $fd
set suf [dump-suffix [lindex $args 2]]
if [regexp -- [lindex $args 1] $text] {
pass "$testcase scan-[lindex $args 0]-dump $suf \"[lindex $args 1]\""
pass "$testname"
} else {
fail "$testcase scan-[lindex $args 0]-dump $suf \"[lindex $args 1]\""
fail "$testname"
}
}
@ -86,18 +91,23 @@ proc scan-dump-times { args } {
# A cleaner solution would require a new DejaGnu release.
upvar 3 name testcase
set suf [dump-suffix [lindex $args 3]]
set testname "$testcase scan-[lindex $args 0]-dump-times $suf \"[lindex $args 1]\" [lindex $args 2]"
set src [file tail [lindex $testcase 0]]
set output_file "[glob $src.[lindex $args 3]]"
set output_file "[glob -nocomplain $src.[lindex $args 3]]"
if { $output_file == "" } {
fail "$testname: dump file does not exist"
return
}
set fd [open $output_file r]
set text [read $fd]
close $fd
set suf [dump-suffix [lindex $args 3]]
if { [llength [regexp -inline -all -- [lindex $args 1] $text]] == [lindex $args 2]} {
pass "$testcase scan-[lindex $args 0]-dump-times $suf \"[lindex $args 1]\" [lindex $args 2]"
pass "$testname"
} else {
fail "$testcase scan-[lindex $args 0]-dump-times $suf \"[lindex $args 1]\" [lindex $args 2]"
fail "$testname"
}
}
@ -122,18 +132,24 @@ proc scan-dump-not { args } {
# it still stores the filename of the testcase in a local variable "name".
# A cleaner solution would require a new DejaGnu release.
upvar 3 name testcase
set suf [dump-suffix [lindex $args 2]]
set testname "$testcase scan-[lindex $args 0]-dump-not $suf \"[lindex $args 1]\""
set src [file tail [lindex $testcase 0]]
set output_file "[glob $src.[lindex $args 2]]"
set output_file "[glob -nocomplain $src.[lindex $args 2]]"
if { $output_file == "" } {
fail "$testname: dump file does not exist"
return
}
set fd [open $output_file r]
set text [read $fd]
close $fd
set suf [dump-suffix [lindex $args 2]]
if ![regexp -- [lindex $args 1] $text] {
pass "$testcase scan-[lindex $args 0]-dump-not $suf \"[lindex $args 1]\""
pass "$testname"
} else {
fail "$testcase scan-[lindex $args 0]-dump-not $suf \"[lindex $args 1]\""
fail "$testname"
}
}
@ -168,18 +184,23 @@ proc scan-dump-dem { args } {
}
upvar 3 name testcase
set suf [dump-suffix [lindex $args 2]]
set testname "$testcase scan-[lindex $args 0]-dump-dem $suf \"[lindex $args 1]\""
set src [file tail [lindex $testcase 0]]
set output_file "[glob $src.[lindex $args 2]]"
set output_file "[glob -nocomplain $src.[lindex $args 2]]"
if { $output_file == "" } {
fail "$testname: dump file does not exist"
return
}
set fd [open "| $cxxfilt < $output_file" r]
set text [read $fd]
close $fd
set suf [dump-suffix [lindex $args 2]]
if [regexp -- [lindex $args 1] $text] {
pass "$testcase scan-[lindex $args 0]-dump-dem $suf \"[lindex $args 1]\""
pass "$testname"
} else {
fail "$testcase scan-[lindex $args 0]-dump-dem $suf \"[lindex $args 1]\""
fail "$testname"
}
}
@ -213,17 +234,23 @@ proc scan-dump-dem-not { args } {
}
upvar 3 name testcase
set suf [dump-suffix [lindex $args 2]]
set testname "$testcase scan-[lindex $args 0]-dump-dem-not $suf \"[lindex $args 1]\""
set src [file tail [lindex $testcase 0]]
set output_file "[glob $src.[lindex $args 2]]"
set output_file "[glob -nocomplain $src.[lindex $args 2]]"
if { $output_file == "" } {
fail "$testname: dump file does not exist"
return
}
set fd [open "| $cxxfilt < $output_file" r]
set text [read $fd]
close $fd
set suf [dump-suffix [lindex $args 2]]
if ![regexp -- [lindex $args 1] $text] {
pass "$testcase scan-[lindex $args 0]-dump-dem-not $suf \"[lindex $args 1]\""
pass "$testname"
} else {
fail "$testcase scan-[lindex $args 0]-dump-dem-not $suf \"[lindex $args 1]\""
fail "$testname"
}
}