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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e45dffd9bd1a8f675188b4ef15913089890c6ab9..babc5567881cf464bdab328f777eca9d64f0c416 100644 (file)
--- 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 67b18ebc7accd8c2e6b36185e2391362dca514db..d069a4a5886950c19a04ba3f7b0c2514c458c738 100644 (file)
--- 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]