1.0.42.29: tweak run-program.impure.lisp

 Make READ-LINEISH less bogus.

 Fixes lp#628887, I hope.

diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp
index 4bba18e..46238b9 100644 (file)
--- 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" #-sunos "" #+sunos nil)
+       (assert-ed ".s/bar/baz/g" nil)
        (assert-ed "w" "4")
        (assert-ed "q" nil)
        (process-wait *ed*)

diff --git a/version.lisp-expr b/version.lisp-expr
index 2fba010..51a210e 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.42.28"
+"1.0.42.29"