PATCH to dejagnu/lib/remote.exp:check_for_board_status

PATCH to dejagnu/lib/remote.exp:check_for_board_status

[Jason Merrill]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

The status wrapper adds "<EOL>*** EXIT code n<EOL>" to the output.
check_for_board_status tries to strip this, but the old regexp would only
strip a CR or an LF, not both, so we were left with a trailing CR if the
target uses the DOS EOL convention.  Fixed thus.

OK?

2002-02-28  Jason Merrill  <jason@redhat.com>

	* lib/remote.exp (check_for_board_status): Remove both CR and LF
	at the beginning of the status wrapper output.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 928 bytes --]

*** remote.exp.~1~	Thu Feb 28 10:44:49 2002
--- remote.exp	Thu Feb 28 02:31:07 2002
*************** proc check_for_board_status  { variable 
*** 1057,1063 ****
      if [regexp "(^|\[\r\n\])\\*\\*\\* EXIT code" $output] {
  	regsub "^.*\\*\\*\\* EXIT code " $output "" result;
  	regsub "\[\r\n\].*$" $result "" result;
! 	regsub -all "(^|\[\r\n\])\\*\\*\\* EXIT code \[^\r\n\]*(\[\r\n\]\[\r\n\]?|$)" $output "" output;
  	regsub "^\[^0-9\]*" $result "" result
  	regsub "\[^0-9\]*$" $result "" result
  	verbose "got board status $result" 3
--- 1057,1063 ----
      if [regexp "(^|\[\r\n\])\\*\\*\\* EXIT code" $output] {
  	regsub "^.*\\*\\*\\* EXIT code " $output "" result;
  	regsub "\[\r\n\].*$" $result "" result;
! 	regsub -all "(^|\r?\n)\\*\\*\\* EXIT code \[^\r\n\]*(\r?\n|$)" $output "" output;
  	regsub "^\[^0-9\]*" $result "" result
  	regsub "\[^0-9\]*$" $result "" result
  	verbose "got board status $result" 3

Re: PATCH to dejagnu/lib/remote.exp:check_for_board_status

[Jason Merrill]

It's been a month and a half; I'm checking this in.

Jason

Re: PATCH to dejagnu/lib/remote.exp:check_for_board_status

[Andrew Cagney]

> It's been a month and a half; I'm checking this in.

The outstanding dejagnu patches haven't been lost - they are sitting in 
my stalled tray.

Looking at the actual change though, I don't think anyone is going to 
notice.  Did you push it up-stream to the official deajgnu sources?

Andrew

Re: PATCH to dejagnu/lib/remote.exp:check_for_board_status

[Jason Merrill]

>>>>> "Andrew" == Andrew Cagney <ac131313@cygnus.com> writes:

> Looking at the actual change though, I don't think anyone is going to
> notice.  Did you push it up-stream to the official deajgnu sources?

Just sent it on, thanks.

Jason