From 0a477f244a6bf9a751603042d2b66f7e9c13e309 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Sun, 3 Dec 2006 13:35:51 +0000 Subject: [PATCH] 1.0.0.14: fix run-program.impure.lisp on OS X 10.4, new SB-POSIX test * stdin and stdout are buffered if the process is not talking to a tty, use use :PTY. (thanks to Sidney Markowitz) * additional test using cat, which doesn't need the :PTY as cat is apparently agressive enough about flushing the buffers. (thanks to Nash Foster) * additional SB-POSIX test from Stefan Lang, currently failing. --- contrib/sb-posix/posix-tests.lisp | 19 +++++- tests/run-program.impure.lisp | 131 ++++++++++++++++++++----------------- version.lisp-expr | 2 +- 3 files changed, 89 insertions(+), 63 deletions(-) diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp index c228642..7cc725b 100644 --- a/contrib/sb-posix/posix-tests.lisp +++ b/contrib/sb-posix/posix-tests.lisp @@ -352,7 +352,6 @@ (ignore-errors (delete-file pathname)))) t) -(defvar *test-directory* (merge-pathnames "test-lab/")) ;;; see comment in filename's designator definition, in macros.lisp (deftest filename-designator.1 (let ((file (format nil "~A/[foo].txt" (namestring *test-directory*)))) @@ -420,6 +419,24 @@ (sb-posix:closedir dir))) t) +(deftest readdir/dirent-name + (let ((dir (sb-posix:opendir *current-directory*))) + (unwind-protect + (equal (sort (loop for entry = (sb-posix:readdir dir) + until (sb-alien:null-alien entry) + collect (sb-posix:dirent-name entry)) + #'string<) + (sort (append '("." "..") + (mapcar (lambda (p) + (enough-namestring p *current-directory*)) + (directory (make-pathname + :name :wild + :type :wild + :defaults *current-directory*)))) + #'string<)) + (sb-posix:closedir dir))) + t) + #-win32 (deftest pwent.1 ;; make sure that we found something diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp index 2f608b4..a9d3632 100644 --- a/tests/run-program.impure.lisp +++ b/tests/run-program.impure.lisp @@ -13,35 +13,29 @@ (cl:in-package :cl-user) -;; Actually there's no real side-effect here. (But see below.) The -;; impurity we're avoiding is the sigchld handler that RUN-PROGRAM -;; sets up, which interfers with the manual unix process control done -;; by the test framework (sometimes the handler will manage to WAIT3 a -;; process before run-tests WAITPIDs it). - -(let* ((process (sb-ext:run-program "/bin/cat" '() :wait nil - :output :stream :input :stream)) - (out (process-input process)) - (in (process-output process))) - (unwind-protect - (loop for i from 0 to 255 do - (write-byte i out) - (force-output out) - (assert (= (read-byte in) i))) - (process-close process))) - -;;; Test driving an external program (ed) through pipes wrapped in +;; In addition to definitions lower down the impurity we're avoiding +;; is the sigchld handler that RUN-PROGRAM sets up, which interfers +;; with the manual unix process control done by the test framework +;; (sometimes the handler will manage to WAIT3 a process before +;; run-tests WAITPIDs it). + +(with-test (:name :run-program-cat-1) + (let* ((process (sb-ext:run-program "/bin/cat" '() :wait nil + :output :stream :input :stream)) + (out (process-input process)) + (in (process-output process))) + (unwind-protect + (loop for i from 0 to 255 do + (write-byte i out) + (force-output out) + (assert (= (read-byte in) i))) + (process-close process)))) + +;;; Test driving an external program (cat) through pipes wrapped in ;;; composite streams. (require :sb-posix) -(defvar *tmpfile* "run-program-ed-test.tmp") - -(with-open-file (f *tmpfile* - :direction :output - :if-exists :supersede) - (write-line "bar" f)) - (defun make-pipe () (multiple-value-bind (in out) (sb-posix:pipe) (let ((input (sb-sys:make-fd-stream in @@ -54,46 +48,61 @@ :buffering :none :name "out"))) (make-two-way-stream input output)))) -(defvar *in-pipe* (make-pipe)) -(defvar *in* (make-synonym-stream '*in-pipe*)) -(defvar *out-pipe* (make-pipe)) -(defvar *out* (make-synonym-stream '*out-pipe*)) - -(defvar *ed* - (run-program "/bin/ed" (list *tmpfile*) :input *in* :output *out* :wait nil)) - -(defun real-input (stream) - (two-way-stream-input-stream (symbol-value (synonym-stream-symbol stream)))) - -(defun magic-read-line (stream) - ;; KLUDGE 1: The otherwise out :buffering :none is worth nothing, - (let ((input (real-input stream))) - (with-output-to-string (s) - ;; KLUDGE 2: Something funny going on with buffering, as plain - ;; READ-CHAR will hang here waiting for the newline, also - ;; -NO-HANG will return too early without the sleep. - ;; - ;; Shoot me now. --NS 2006-06-09 - (loop for c = (progn (sleep 0.2) (read-char-no-hang input)) - while (and c (not (eq #\newline c))) - do (write-char c s))))) +(defparameter *cat-in-pipe* (make-pipe)) +(defparameter *cat-in* (make-synonym-stream '*cat-in-pipe*)) +(defparameter *cat-out-pipe* (make-pipe)) +(defparameter *cat-out* (make-synonym-stream '*cat-out-pipe*)) + +(with-test (:name :run-program-cat-2) + (let ((cat (run-program "/bin/cat" nil :input *cat-in* :output *cat-out* + :wait nil))) + (dolist (test '("This is a test!" + "This is another test!" + "This is the last test....")) + (write-line test *cat-in*) + (assert (equal test (read-line *cat-out*)))) + (process-close cat))) + +;;; The above test used to use ed, but there were buffering issues: on some platforms +;;; buffering of stdin and stdout depends on their TTYness, and ed isn't sufficiently +;;; agressive about flushing them. So, here's another test using :PTY. + +(defparameter *tmpfile* "run-program-ed-test.tmp") + +(with-open-file (f *tmpfile* + :direction :output + :if-exists :supersede) + (write-line "bar" f)) + +(defparameter *ed* + (run-program "/bin/ed" (list *tmpfile*) :wait nil :pty t)) + +(defparameter *ed-pipe* (make-two-way-stream (process-pty *ed*) (process-pty *ed*))) +(defparameter *ed-in* (make-synonym-stream '*ed-pipe*)) +(defparameter *ed-out* (make-synonym-stream '*ed-pipe*)) + +(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)))) (defun assert-ed (command response) (when command - (write-line command *in*) - (force-output *in*)) - (let ((got (magic-read-line *out*))) + (write-line command *ed-in*) + (force-output *ed-in*)) + (let ((got (read-linish *ed-out*))) (unless (equal response got) (error "wanted ~S from ed, got ~S" response got))) *ed*) -(assert-ed nil "4") -(assert-ed ".s/bar/baz/g" "") -(assert-ed "w" "4") -(assert-ed "q" "") -(process-wait *ed*) - -(with-open-file (f *tmpfile*) - (assert (equal "baz" (read-line f)))) - -;(delete-file *tmp*) +(unwind-protect + (with-test (:name :run-program-ed) + (assert-ed nil "4") + (assert-ed ".s/bar/baz/g" "") + (assert-ed "w" "4") + (assert-ed "q" "") + (process-wait *ed*) + (with-open-file (f *tmpfile*) + (assert (equal "baz" (read-line f))))) + (delete-file *tmpfile*)) diff --git a/version.lisp-expr b/version.lisp-expr index ffb4122..a57d159 100644 --- 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.0.13" +"1.0.0.14" -- 1.7.10.4