Commit c15190ec by Andreas Schwab Committed by Andreas Schwab

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

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

From-SVN: r81784
parent eb18fd8d
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> 2004-05-13 Bud Davis <bdavis9659@comcast.net>
PR fortran/15294 PR fortran/15294
......
# 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 # 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 # it under the terms of the GNU General Public License as published by
...@@ -50,7 +50,7 @@ proc gfortran_version { } { ...@@ -50,7 +50,7 @@ proc gfortran_version { } {
set tmp [remote_exec host "$compiler -v"] set tmp [remote_exec host "$compiler -v"]
set status [lindex $tmp 0]; set status [lindex $tmp 0];
set output [lindex $tmp 1]; set output [lindex $tmp 1];
regexp "version.*$" $output version regexp "version\[^\n\r\]*" $output version
if { $status == 0 && [info exists version] } then { if { $status == 0 && [info exists version] } then {
if [is_remote host] { if [is_remote host] {
clone_output "$compiler $version\n" clone_output "$compiler $version\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment