This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch for PR16403: gcc version not reported to gcc-testresults
- From: "Billinghurst, David (CALCRTS)" <david dot billinghurst at comalco dot riotinto dot com dot au>
- To: <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 18 Jun 2004 11:45:06 +1000
- Subject: Patch for PR16403: gcc version not reported to gcc-testresults
The testsuite doesn't report the GCC version to the *.sum files if gcc
is configured with --enable-version-specific-runtime-libs. This is
fixed by tweaks to the regexp in the testsuite/lib/${tool}.exp files.
Tested on i686-pc-cygwin. I will commit as obvious once bootstrapped
on another system.
OK to backport to 3.4?
2004-06-18 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/gfortran.exp (gfortran_version): Likewise
* lib/objc.exp (objc_version): Likewise
* lib/treelang.exp (treelang_version): Likewise
Index: lib/g++.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/g++.exp,v
retrieving revision 1.38
diff -u -r1.38 g++.exp
--- lib/g++.exp 28 Feb 2004 09:40:24 -0000 1.38
+++ lib/g++.exp 18 Jun 2004 01:31:18 -0000
@@ -49,7 +49,7 @@
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"
Index: lib/g77.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/g77.exp,v
retrieving revision 1.18
diff -u -r1.18 g77.exp
--- lib/g77.exp 23 Jan 2004 04:42:39 -0000 1.18
+++ lib/g77.exp 18 Jun 2004 01:31:18 -0000
@@ -50,7 +50,7 @@
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"
Index: lib/gcc.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/gcc.exp,v
retrieving revision 1.13
diff -u -r1.13 gcc.exp
--- lib/gcc.exp 10 Dec 2003 20:36:02 -0000 1.13
+++ lib/gcc.exp 18 Jun 2004 01:31:19 -0000
@@ -56,7 +56,7 @@
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 {
Index: lib/gfortran.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/gfortran.exp,v
retrieving revision 1.3
diff -u -r1.3 gfortran.exp
--- lib/gfortran.exp 13 May 2004 14:38:53 -0000 1.3
+++ lib/gfortran.exp 18 Jun 2004 01:31:19 -0000
@@ -50,7 +50,7 @@
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"
Index: lib/objc.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/objc.exp,v
retrieving revision 1.23
diff -u -r1.23 objc.exp
--- lib/objc.exp 7 Jun 2004 08:48:31 -0000 1.23
+++ lib/objc.exp 18 Jun 2004 01:31:19 -0000
@@ -56,7 +56,7 @@
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 {
Index: lib/treelang.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/treelang.exp,v
retrieving revision 1.2
diff -u -r1.2 treelang.exp
--- lib/treelang.exp 20 Jan 2004 01:57:57 -0000 1.2
+++ lib/treelang.exp 18 Jun 2004 01:31:19 -0000
@@ -61,7 +61,7 @@
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 {