diff options
| author | Ben Elliston <bje@gnu.org> | 2016-03-27 01:31:10 +1100 |
|---|---|---|
| committer | Rob Savoye <rob.savoye@linaro.org> | 2016-03-26 22:18:26 +0100 |
| commit | 4e88754bafcd0588881819835fc6e3933306241a (patch) | |
| tree | dab4c3aed201c7f7dafc8c97f3794f56233a2e32 /lib/remote.exp | |
| parent | 20db5668da9bfc4621a15ab576d7ad2d51ceca48 (diff) | |
* lib/remote.exp (standard_wait): Append any trailing characters
to $output that may be still in $expect_out(buffer) when eof is
matched. Remove arbitrary limitation in the ".+" matching case,
similar to the change to local_exec on 2016-02-17.
(cherry picked from commit 8d2062e95e02c9c575ef6295afbd5df45bf2c2dd)
Conflicts:
ChangeLog
Diffstat (limited to 'lib/remote.exp')
| -rw-r--r-- | lib/remote.exp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/remote.exp b/lib/remote.exp index c334416..1bea4e1 100644 --- a/lib/remote.exp +++ b/lib/remote.exp @@ -1123,17 +1123,15 @@ proc standard_wait { dest timeout } { remote_expect $dest $timeout { -re ".+" { append output $expect_out(buffer) - if { [string length $output] > 512000 } { - remote_close $dest - set status 1 - } else { - exp_continue -continue_timer - } + exp_continue -continue_timer } timeout { warning "program timed out." } eof { + # There may be trailing characters in the buffer. + # Append them, too. + append output $expect_out(buffer) if {[board_info $dest exists fileid_origid]} { global board_info |