From: David Billinghurst <David.Billinghurst@riotinto.com>
Date: Mon, 24 Jan 2005 05:05:04 +0000 (+0000)
Subject: re PR other/16043 ([3.4 only] gcc version not reported with "enable-version-specific... 
X-Git-Tag: releases/gcc-3.4.4~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ddadc5634e2aa5a5c99b15a6c3ab6907238f2b;p=thirdparty%2Fgcc.git

re PR other/16043 ([3.4 only] gcc version not reported with "enable-version-specific-runtime-libs" to gcc-testresults)

2005-01-24 David Billinghurst (David.Billinghurst@riotinto.com)

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

From-SVN: r94142
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 74841e8c016f..659ee513f9fd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-24 David Billinghurst (David.Billinghurst@riotinto.com)
+
+	PR other/16403 
+	* lib/g++.exp (g++_version): Tweak regexp for version 
+	* lib/g77.exp (g77_version): Likewise 
+	* lib/objc.exp (objc_version): Likewise 
+	* lib/treelang.exp (treelang_version): Likewise 
+
 2005-01-19  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
 	PR c++/19258
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index d7ab8bbb5392..0b5681b134b4 100644
--- 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 52ec8964d97d..a9dcbe96e145 100644
--- 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/objc.exp b/gcc/testsuite/lib/objc.exp
index c7dc70ece7de..2819660df380 100644
--- 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 {