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 6ea7d55..32fa6de 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 cfefeee..1fcc38f 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 6e182d4..f8c5171 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 29c687b..ac4dc35 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 ab6377e..14bdf13 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 {