--- Begin Message ---
Subject: |
PATCH to dejagnu/lib/remote.exp:check_for_board_status |
Date: |
Thu, 28 Feb 2002 11:08:25 +0000 |
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.
2002-02-28 Jason Merrill <address@hidden>
* lib/remote.exp (check_for_board_status): Remove both CR and LF
at the beginning of the status wrapper output.
*** 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
--- End Message ---