[PATCH] Fix for testresults bug 10819

[Robert Schiele <rschiele at uni-mannheim dot de>]

Hi!

The following patch fixes bug 10819.  Full bootstrap tests on Linux system
will be done in a few hours automatically.  Testing on other platforms
(especially Windows and MacOS) would be appreciated.

	* lib/gcc.exp (default_gcc_version): Do not match NL/CR characters
	to fix Bug 10819.
	* lib/g++.exp (g++_version): Likewise.
	* lib/g77.exp (g77_version): Likewise.
	* lib/objc.exp (default_objc_version): Likewise.

Index: gcc/testsuite/lib/g++.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/g++.exp,v
retrieving revision 1.33
diff -c -r1.33 g++.exp
*** gcc/testsuite/lib/g++.exp	19 Nov 2003 04:58:34 -0000	1.33
--- gcc/testsuite/lib/g++.exp	7 Dec 2003 21:18:51 -0000
***************
*** 49,55 ****
  	set tmp [remote_exec host "$compiler -v"]
  	set status [lindex $tmp 0];
  	set output [lindex $tmp 1];
! 	regexp "version.*$" $output version
  	if { $status == 0 && [info exists version] } then {
  	    if [is_remote host] {
  		clone_output "$compiler $version\n"
--- 49,55 ----
  	set tmp [remote_exec host "$compiler -v"]
  	set status [lindex $tmp 0];
  	set output [lindex $tmp 1];
! 	regexp "version\[^\n\r\]*" $output version
  	if { $status == 0 && [info exists version] } then {
  	    if [is_remote host] {
  		clone_output "$compiler $version\n"
Index: gcc/testsuite/lib/g77.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/g77.exp,v
retrieving revision 1.16
diff -c -r1.16 g77.exp
*** gcc/testsuite/lib/g77.exp	19 Nov 2003 04:58:34 -0000	1.16
--- gcc/testsuite/lib/g77.exp	7 Dec 2003 21:18:51 -0000
***************
*** 50,56 ****
  	set tmp [remote_exec host "$compiler -v"]
  	set status [lindex $tmp 0];
  	set output [lindex $tmp 1];
! 	regexp "version.*$" $output version
  	if { $status == 0 && [info exists version] } then {
  	    if [is_remote host] {
  		clone_output "$compiler $version\n"
--- 50,56 ----
  	set tmp [remote_exec host "$compiler -v"]
  	set status [lindex $tmp 0];
  	set output [lindex $tmp 1];
! 	regexp "version\[^\n\r\]*" $output version
  	if { $status == 0 && [info exists version] } then {
  	    if [is_remote host] {
  		clone_output "$compiler $version\n"
Index: gcc/testsuite/lib/gcc.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/gcc.exp,v
retrieving revision 1.12
diff -c -r1.12 gcc.exp
*** gcc/testsuite/lib/gcc.exp	12 Jun 2003 05:54:23 -0000	1.12
--- gcc/testsuite/lib/gcc.exp	7 Dec 2003 21:18:51 -0000
***************
*** 56,62 ****
  	set tmp [remote_exec host "$compiler -v"]
  	set status [lindex $tmp 0];
  	set output [lindex $tmp 1];
! 	regexp "version.*$" $output version
  	if { $status == 0 && [info exists version] } then {
  	    clone_output "$compiler_name $version\n"
  	} else {
--- 56,62 ----
  	set tmp [remote_exec host "$compiler -v"]
  	set status [lindex $tmp 0];
  	set output [lindex $tmp 1];
! 	regexp "version\[^\n\r\]*" $output version
  	if { $status == 0 && [info exists version] } then {
  	    clone_output "$compiler_name $version\n"
  	} else {
Index: gcc/testsuite/lib/objc.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/objc.exp,v
retrieving revision 1.19
diff -c -r1.19 objc.exp
*** gcc/testsuite/lib/objc.exp	19 Nov 2003 04:58:34 -0000	1.19
--- gcc/testsuite/lib/objc.exp	7 Dec 2003 21:18:51 -0000
***************
*** 56,62 ****
  	set tmp [remote_exec host "$compiler -v"]
  	set status [lindex $tmp 0];
  	set output [lindex $tmp 1];
! 	regexp "version.*$" $output version
  	if { $status == 0 && [info exists version] } then {
  	    clone_output "$compiler_name $version\n"
  	} else {
--- 56,62 ----
  	set tmp [remote_exec host "$compiler -v"]
  	set status [lindex $tmp 0];
  	set output [lindex $tmp 1];
! 	regexp "version\[^\n\r\]*" $output version
  	if { $status == 0 && [info exists version] } then {
  	    clone_output "$compiler_name $version\n"
  	} else {

Robert

-- 
Robert Schiele			Tel.: +49-621-181-2517
Dipl.-Wirtsch.informatiker	mailto:rschiele@uni-mannheim.de

Attachment: pgp00000.pgp
Description: PGP signature