From 987aab1cbacbf7e92f43fc38ffe19e0820af20f1 Mon Sep 17 00:00:00 2001
From: David Billinghurst <David.Billinghurst@riotinto.com>
Date: Fri, 9 Jul 2004 10:20:42 +0000
Subject: [PATCH] re PR other/16444 (gfortran.dg test harness barfs on
multilibs)
2004-07-09 David Billinghurst (David.Billinghurst@riotinto.com)
PR other/16444
* lib/fortran-torture.exp: Rename proc search_for to
search_for_re.
From-SVN: r84361
---
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/lib/fortran-torture.exp | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e45dffd9bd1a..babc5567881c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-09 David Billinghurst (David.Billinghurst@riotinto.com)
+
+ * lib/fortran-torture.exp: Rename proc search_for to
+ search_for_re.
+
2004-07-09 Eric Botcazou <ebotcazou@libertysurf.fr>
* gcc.c-torture/execute/simd-5.x: New file.
diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
index 67b18ebc7acc..d069a4a58869 100644
--- a/gcc/testsuite/lib/fortran-torture.exp
+++ b/gcc/testsuite/lib/fortran-torture.exp
@@ -239,9 +239,9 @@ proc fortran-torture-execute { src } {
# integers, but that is obviously much harder than just regexping this.
# So maybe we should just avoid those in testcases.
if [target_info exists no_long_long] then {
- if [expr [search_for $src "integer\*8"] \
- +[search_for $src "integer *( *8 *)"] \
- +[search_for $src "integer *( *kind *= *8 *)"]] \
+ if [expr [search_for_re $src "integer\*8"] \
+ +[search_for_re $src "integer *( *8 *)"] \
+ +[search_for_re $src "integer *( *kind *= *8 *)"]] \
then {
untested "$testcase execution, $option"
continue
@@ -269,9 +269,9 @@ proc fortran-torture-execute { src } {
#
-# search_for -- looks for a string match in a file
+# search_for_re -- looks for a string match in a file
#
-proc search_for { file pattern } {
+proc search_for_re { file pattern } {
set fd [open $file r]
while { [gets $fd cur_line]>=0 } {
set lower [string tolower $cur_line]
--
GitLab