From 222d3b39a663cccdaa87d0b5cfb0cc4a591013b2 Mon Sep 17 00:00:00 2001 From: Janis Johnson Date: Mon, 20 Jun 2011 17:08:37 +0000 Subject: [PATCH] scandump.exp (scan-dump, [...]): Treat a missing dump file as unresolved and report the reason to the log file. * lib/scandump.exp (scan-dump, scan-dump-times, scan-dump-not, scan-dump-dem, scan-dump-dem-not): Treat a missing dump file as unresolved and report the reason to the log file. From-SVN: r175224 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/lib/scandump.exp | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 23714ca..7939b52 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2011-06-20 Janis Johnson + * lib/scandump.exp (scan-dump, scan-dump-times, scan-dump-not, + scan-dump-dem, scan-dump-dem-not): Treat a missing dump file as + unresolved and report the reason to the log file. + * lib/scanasm.exp (object-size): Move argument processing earlier to report errors before verifying that the file exists. Report problems detected at runtime as unresolved instead of error and diff --git a/gcc/testsuite/lib/scandump.exp b/gcc/testsuite/lib/scandump.exp index 7800bde..3f2ad2d 100644 --- a/gcc/testsuite/lib/scandump.exp +++ b/gcc/testsuite/lib/scandump.exp @@ -55,7 +55,8 @@ proc scan-dump { args } { set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return } @@ -97,7 +98,8 @@ proc scan-dump-times { args } { set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 3]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return } @@ -139,7 +141,8 @@ proc scan-dump-not { args } { set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return } @@ -190,7 +193,8 @@ proc scan-dump-dem { args } { set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return } @@ -241,7 +245,8 @@ proc scan-dump-dem-not { args } { set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return } -- 2.7.4