From c15190ecef2cdd2ff2df390e2cb5197ea585c9de Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Thu, 13 May 2004 14:38:53 +0000
Subject: [PATCH] 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
---
gcc/testsuite/ChangeLog | 6 ++++++
gcc/testsuite/lib/gfortran.exp | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index be4920e880cd..123f82b017cf 100644
--- 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 483c3893a79a..27640a550a5d 100644
--- 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"
--
GitLab