From da97e61fdedec0eaed8f2e82965c5d3ccda50465 Mon Sep 17 00:00:00 2001
From: billingd <billingd@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 18 Jun 2004 23:48:45 +0000
Subject: [PATCH] 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
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83374 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/testsuite/ChangeLog | 9 +++++++++
gcc/testsuite/lib/g++.exp | 2 +-
gcc/testsuite/lib/g77.exp | 2 +-
gcc/testsuite/lib/gcc.exp | 2 +-
gcc/testsuite/lib/gfortran.exp | 2 +-
gcc/testsuite/lib/objc.exp | 2 +-
gcc/testsuite/lib/treelang.exp | 2 +-
7 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c29b49fa94a1..856b789fe6c2 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 518e836020c6..161371b4afa2 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 c722c20c31a4..ec0494d2fe56 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 ac4dc35e8e96..1741406b91de 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 27640a550a5d..12236b45a91b 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 1b6c10d60fec..d00da0fa92e2 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 1337e92888c6..cea35268dabe 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 {
--
GitLab