X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-program.impure.lisp;h=46238b9c5ceae0ff642589be8acbb037b2a3ca14;hb=6d36f2d6954cb79e3c88fef33fe0c3ad63deaea8;hp=b6b38cf464fa3f5f52dafd5f0af0c9d4082872af;hpb=0e1933f873c9fb073e3fc07e73c5401277bd0681;p=sbcl.git

diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp
index b6b38cf..46238b9 100644
--- a/tests/run-program.impure.lisp
+++ b/tests/run-program.impure.lisp
@@ -84,8 +84,10 @@
 (defun read-linish (stream)
   (with-output-to-string (s)
     (loop for c = (read-char stream)
-       while (and c (not (eq #\newline c)) (not (eq #\return c)))
-       do (write-char c s))))
+          while (and c (not (eq #\newline c)))
+             ;; Some eds like to send \r\n
+          do (unless (eq #\return c)
+               (write-char c s)))))
 
 (defun assert-ed (command response)
   (when command
@@ -100,7 +102,7 @@
 (unwind-protect
      (with-test (:name :run-program-ed)
        (assert-ed nil "4")
-       (assert-ed ".s/bar/baz/g" "")
+       (assert-ed ".s/bar/baz/g" nil)
        (assert-ed "w" "4")
        (assert-ed "q" nil)
        (process-wait *ed*)