From: Nikodemus S. <de...@us...> - 2010-09-03 13:22:06
|
Update of /cvsroot/sbcl/sbcl/tests In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12076/tests Modified Files: run-program.impure.lisp Log Message: 1.0.42.29: tweak run-program.impure.lisp Make READ-LINEISH less bogus. Fixes lp#628887, I hope. Index: run-program.impure.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/tests/run-program.impure.lisp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- run-program.impure.lisp 3 Sep 2010 13:01:34 -0000 1.15 +++ run-program.impure.lisp 3 Sep 2010 13:21:57 -0000 1.16 @@ -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*) |