aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2016-03-27 01:31:10 +1100
committerBen Elliston <bje@gnu.org>2016-03-27 08:05:05 +1100
commit8d2062e95e02c9c575ef6295afbd5df45bf2c2dd (patch)
tree5b1067a93caf5bfc77175d16239ad4fd243752f8 /lib
parent038cf7d9fa9e3ac1b7432955e11c763b52d7223c (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.
Diffstat (limited to 'lib')
-rw-r--r--lib/remote.exp10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/remote.exp b/lib/remote.exp
index e0d9d18..029d934 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -1122,17 +1122,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