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

2003-12-09  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: r74507

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ea7d5565f55dab5fbd7b6e4124f9e3deb82813d..32fa6de48e41d9460c796ffb82c3cad46a13433c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-09  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  Richard Earnshaw  <rearnsha@arm.com>
 
        * arm.md: New split patterns for optimizing bitfield accesses.

diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index cfefeeeb5e1bb6470295c31953807c9cde4f4489..1fcc38f9fa275264d8671f43df6940a301a81f0a 100644 (file)
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -49,7 +49,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 6e182d48cd8a3a6f06f9931099d90d98046eadb0..f8c517163bf523efa80365e3670dfd51b81a9cdf 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 29c687be2c9b3c20ada35e6ec1507193db14d10b..ac4dc35e8e96826fc6b0951e76c2b0a3294180dc 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 ab6377e236697585f034e1eee7ab70111df454e9..14bdf133168e4693f6c4fa1610be9c36dd3d71cc 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 {