From: David Billinghurst <David.Billinghurst@riotinto.com>
Date: Fri, 18 Jun 2004 23:48:45 +0000 (+0000)
Subject: re PR other/16043 ([3.4 only] gcc version not reported with "enable-version-specific... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb0737c2f5ead1e96c0eb3f72305b0d509cb53f4;p=gcc.git

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

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 c29b49fa94a..856b789fe6c 100644
--- 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 518e836020c..161371b4afa 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 c722c20c31a..ec0494d2fe5 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/gcc.exp b/gcc/testsuite/lib/gcc.exp
index ac4dc35e8e9..1741406b91d 100644
--- 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 27640a550a5..12236b45a91 100644
--- 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 1b6c10d60fe..d00da0fa92e 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 {
diff --git a/gcc/testsuite/lib/treelang.exp b/gcc/testsuite/lib/treelang.exp
index 1337e92888c..cea35268dab 100644
--- 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 {