From 10de6d35ba793376ad963b88e40fecf3ea6ea914 Mon Sep 17 00:00:00 2001 From: Kate Hedstrom Date: Tue, 25 Nov 1997 23:17:56 +0000 Subject: [PATCH] * lib/f-torture.exp: Improve error and loop detection. From-SVN: r16711 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/lib/f-torture.exp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 55df5aea1f4..8f6a051de40 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +Tue Nov 25 16:18:51 1997 Kate Hedstrom (kate@ahab.rutgers.edu) + + * lib/f-torture.exp: Improve error and loop detection. + Fri Sep 26 10:50:53 1997 Bob Manson * lib/c-torture.exp(c-torture-execute): Fix typo. diff --git a/gcc/testsuite/lib/f-torture.exp b/gcc/testsuite/lib/f-torture.exp index 3493b03840a..5bd6027576c 100644 --- a/gcc/testsuite/lib/f-torture.exp +++ b/gcc/testsuite/lib/f-torture.exp @@ -74,7 +74,7 @@ proc f-torture-compile { src option } { set comp_output [g77_target_compile "$src" "$output" object $options]; # Set a few common compiler messages. - set fatal_signal "*cc: Internal compiler error: program*got fatal signal" + set fatal_signal "*77*: Internal compiler error: program*got fatal signal" if [string match "$fatal_signal 6" $comp_output] then { g77_fail $testcase "Got Signal 6, $option" @@ -89,7 +89,7 @@ proc f-torture-compile { src option } { } # We shouldn't get these because of -w, but just in case. - if [string match "*cc:*warning:*" $comp_output] then { + if [string match "*77*:*warning:*" $comp_output] then { warning "$testcase: (with warnings) $option" send_log "$comp_output\n" unresolved "$testcase, $option" @@ -146,7 +146,7 @@ proc f-torture-execute { src } { # Look for a loop within the source code - if we don't find one, # don't pass -funroll[-all]-loops. global torture_with_loops torture_without_loops - if [expr [search_for $src "do*("]+[search_for $src "while*("]] then { + if [expr [search_for $src "do *\[0-9\]"]+[search_for $src "end *do"]] then { set option_list $torture_with_loops } else { set option_list $torture_without_loops @@ -177,7 +177,7 @@ proc f-torture-execute { src } { set comp_output [g77_target_compile "$src" "$executable" executable $options]; # Set a few common compiler messages. - set fatal_signal "*cc: Internal compiler error: program*got fatal signal" + set fatal_signal "*77*: Internal compiler error: program*got fatal signal" if [string match "$fatal_signal 6" $comp_output] then { g77_fail $testcase "Got Signal 6, $option" @@ -192,7 +192,7 @@ proc f-torture-execute { src } { } # We shouldn't get these because of -w, but just in case. - if [string match "*cc:*warning:*" $comp_output] then { + if [string match "*77*:*warning:*" $comp_output] then { warning "$testcase: (with warnings) $option" send_log "$comp_output\n" unresolved "$testcase, $option" @@ -225,7 +225,7 @@ proc f-torture-execute { src } { # See if this source file uses "long long" types, if it does, and # no_long_long is set, skip execution of the test. if [target_info exists no_long_long] then { - if [expr [search_for $src "long long"]] then { + if [expr [search_for $src "integer\*8"]] then { untested "$testcase execution, $option" continue } @@ -252,7 +252,7 @@ proc search_for { file pattern } { set fd [open $file r] while { [gets $fd cur_line]>=0 } { set lower [string tolower $cur_line] - if [string match "*$pattern*" $lower] then { + if [regexp "$pattern" $lower] then { close $fd return 1 } @@ -302,7 +302,7 @@ proc f-torture { args } { # Look for a loop within the source code - if we don't find one, # don't pass -funroll[-all]-loops. global torture_with_loops torture_without_loops - if [expr [search_for $src "do*("]+[search_for $src "while*("]] then { + if [expr [search_for $src "do *\[0-9\]"]+[search_for $src "end *do"]] then { set option_list $torture_with_loops } else { set option_list $torture_without_loops