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

2003-12-10  Robert Schiele  <rschiele@uni-mannheim.de>

        PR other/10819
        * lib/gcc.exp (default_gcc_version): Do not match NL/CR characters
        to fix Bug 10819.
        * lib/g++.exp (g++_version): Likewise.
        * lib/g77.exp (g77_version): Likewise.
        * lib/objc.exp (default_objc_version): Likewise.

From-SVN: r74515

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2693b295868705fdab5ce7d18edb1f67c1199b45..160394bf7850fd47a096bb1c424174e341b1fdaf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-10  Robert Schiele  <rschiele@uni-mannheim.de>
+
+       PR other/10819
+       * lib/gcc.exp (default_gcc_version): Do not match NL/CR characters
+       to fix Bug 10819.
+       * lib/g++.exp (g++_version): Likewise.
+       * lib/g77.exp (g77_version): Likewise.
+       * lib/objc.exp (default_objc_version): Likewise.
+
 2003-12-10  Nathanael Nerode  <neroden@gcc.gnu.org>
 
        Backport from mainline:

diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 749e1f1c2cde79872b938eac0fba9872d8328159..2ec0408ecca86cd8ff394264bad91e1cb3917641 100644 (file)
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -50,7 +50,7 @@ proc g++_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"

diff --git a/gcc/testsuite/lib/g77.exp b/gcc/testsuite/lib/g77.exp
index 8f20eb48cc88c08fefae2bdf25e619c6c6cd9f22..49ac6c86e74ab7de584dc6019b922b0e49e6b253 100644 (file)
--- a/gcc/testsuite/lib/g77.exp
+++ b/gcc/testsuite/lib/g77.exp
@@ -50,7 +50,7 @@ proc g77_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"

diff --git a/gcc/testsuite/lib/gcc.exp b/gcc/testsuite/lib/gcc.exp
index f090cb11f49a5dbd94ccc3b8ce8e0200f0292ee1..cdba01e81d59b0394ed24d4828b8cf4cb55099fa 100644 (file)
--- a/gcc/testsuite/lib/gcc.exp
+++ b/gcc/testsuite/lib/gcc.exp
@@ -56,7 +56,7 @@ proc default_gcc_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 {
            clone_output "$compiler_name $version\n"
        } else {

diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index 3ec19e336ff89ae10ca62b6e6acfec6e16bc7014..74093df667b0c376bbb181130e30f0b8edb3a3df 100644 (file)
--- a/gcc/testsuite/lib/objc.exp
+++ b/gcc/testsuite/lib/objc.exp
@@ -56,7 +56,7 @@ proc default_objc_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 {
            clone_output "$compiler_name $version\n"
        } else {