re PR other/16043 ([3.4 only] gcc version not reported with "enable-version-specific...

2004-06-19  David Billinghurst (David.Billinghurst@riotinto.com)

	PR other/16043
	* lib/g++.exp (g++_version): Tweak regexp for version
	* lib/g77.exp (g77_version): Likewise
	* lib/gfortran.exp (gfortran_version): Likewise
	* lib/objc.exp (objc_version): Likewise
	* lib/treelang.exp (treelang_version): Likewise

From-SVN: r83374

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c29b49fa94a1e0849093e005479b2da30a7d9901..856b789fe6c21e47c5eeeeea7244a43a4a6e5b8c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-19  David Billinghurst (David.Billinghurst@riotinto.com)
+
+       PR other/16043
+       * lib/g++.exp (g++_version): Tweak regexp for version
+       * lib/g77.exp (g77_version): Likewise
+       * lib/gfortran.exp (gfortran_version): Likewise
+       * lib/objc.exp (objc_version): Likewise
+       * lib/treelang.exp (treelang_version): Likewise
+
 2004-06-19  Jakub Jelinek  <jakub@redhat.com>
 
        * gcc.dg/compat/struct-align-2_x.c: Include <limits.h>.

diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 518e836020c6ccea7d62b5deb0b3abd3b1dd68bc..161371b4afa28fe1776b17aabe4a26932906e3e2 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\[^\n\r\]*" $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 c722c20c31a4b7c986c74c2093550b454cb7c9b5..ec0494d2fe5630fd285f3559cb30859e2e1928de 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\[^\n\r\]*" $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 ac4dc35e8e96826fc6b0951e76c2b0a3294180dc..1741406b91de29d47872840472ccf3ea8bcd44ee 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\[^\n\r\]*" $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/gfortran.exp b/gcc/testsuite/lib/gfortran.exp
index 27640a550a5d22201a1a6ede5de1dfb1e7a80162..12236b45a91bfe9e75a26f56bc40bc3812c081eb 100644 (file)
--- a/gcc/testsuite/lib/gfortran.exp
+++ b/gcc/testsuite/lib/gfortran.exp
@@ -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\[^\n\r\]*" $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/objc.exp b/gcc/testsuite/lib/objc.exp
index 1b6c10d60fec80f29023d99167ddd78d22fb1dfb..d00da0fa92e2f3870dd25d91cf48810b07c8ce9a 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\[^\n\r\]*" $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/treelang.exp b/gcc/testsuite/lib/treelang.exp
index 1337e92888c630240893cd891456b601f7a43323..cea35268dabe2a21226bd9cd6c60ca769199a567 100644 (file)
--- a/gcc/testsuite/lib/treelang.exp
+++ b/gcc/testsuite/lib/treelang.exp
@@ -61,7 +61,7 @@ proc default_treelang_version { } {
        set tmp [remote_exec host "$compiler -v"]
        set status [lindex $tmp 0];
        set output [lindex $tmp 1];
-       regexp "version\[^\n\r\]*" $output version
+       regexp " version \[^\n\r\]*" $output version
        if { $status == 0 && [info exists version] } then {
            clone_output "$compiler_name $version\n"
        } else {