X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-program.impure.lisp;h=9ef07e5014abdbaa82fc295c882f64acf74484a0;hb=1e7fc4730aa0cafb0aba5278e8cdbdba566b8725;hp=609976aacdbabfb66500f680d0b1c5b48c725bd1;hpb=fe5cd1af557ea21675dc72c8c4c581781613025d;p=sbcl.git diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp index 609976a..9ef07e5 100644 --- a/tests/run-program.impure.lisp +++ b/tests/run-program.impure.lisp @@ -13,87 +13,125 @@ (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 - :input t + (let ((input (sb-sys:make-fd-stream in + :input t :external-format :ascii :buffering :none :name "in")) - (output (sb-sys:make-fd-stream out - :output t + (output (sb-sys:make-fd-stream out + :output t :external-format :ascii :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*)) + +;; Around 1.0.12 there was a regression when :INPUT or :OUTPUT was a +;; pathname designator. Since these use the same code, it should +;; suffice to test just :INPUT. +(let ((file)) + (unwind-protect + (progn (with-open-file (f "run-program-test.tmp" :direction :output) + (setf file (truename f)) + (write-line "Foo" f)) + (assert (run-program "cat" () + :input file :output t + :search t :wait t))) + (when file + (delete-file file)))) + +;;; This used to crash on Darwin and trigger recursive lock errors on +;;; every platform. +(with-test (:name (:run-program :stress)) + ;; Do it a hundred times in batches of 10 so that with a low limit + ;; of the number of processes the test can have a chance to pass. + (loop + repeat 10 do + (map nil + #'sb-ext:process-wait + (loop repeat 10 + collect + (sb-ext:run-program "/bin/echo" ' + ("It would be nice if this didn't crash.") + :wait nil :output nil)))))