* 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.

diff --git a/ChangeLog b/ChangeLog
index 6767718..a5609cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-03-27  Ben Elliston  <bje@gnu.org>
+
+       * 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.
+
 2016-03-23  Ben Elliston  <bje@gnu.org>
 
        * Makefile.am (baseboard_DATA): Remove cygwin.exp, mcore-elf.exp,

diff --git a/lib/remote.exp b/lib/remote.exp
index e0d9d18..029d934 100644 (file)
--- 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