re PR testsuite/10819 (testsuite creates CR+LF on compiler version lines in test...

PR other/10819
* lib/gfortran.exp (gfortran_version): Do not match NL/CR
characters.

From-SVN: r81784

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index be4920e880cdadeebc28ef71d0a38fea8d251538..123f82b017cf391ccec2bd159f3b7105d90fc113 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-13  Andreas Schwab  <schwab@suse.de>
+
+       PR other/10819
+       * lib/gfortran.exp (gfortran_version): Do not match NL/CR
+       characters.
+
 2004-05-13  Bud Davis  <bdavis9659@comcast.net>
 
        PR fortran/15294

diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp
index 483c3893a79ad1345d6156211b25ff7d82319ef0..27640a550a5d22201a1a6ede5de1dfb1e7a80162 100644 (file)
--- a/gcc/testsuite/lib/gfortran.exp
+++ b/gcc/testsuite/lib/gfortran.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ proc gfortran_version { } {
        set tmp [remote_exec host "$compiler -v"]
        set status [lindex $tmp 0];
        set output [lindex $tmp 1];
-       regexp "version.*$" $output version
+       regexp "version\[^\n\r\]*" $output version
        if { $status == 0 && [info exists version] } then {
            if [is_remote host] {
                clone_output "$compiler $version\n"