X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-program.impure.lisp;h=9ad1a9a6533ba193620e358d96f85695eda0c071;hb=82cd148d729c241e79c8df04b700beec1b7c55de;hp=8a4b3a3761304e488ba3bdedd228dd260856347a;hpb=625c9493a8a7b5186144d21302437cf4f4f3571c;p=sbcl.git diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp index 8a4b3a3..9ad1a9a 100644 --- a/tests/run-program.impure.lisp +++ b/tests/run-program.impure.lisp @@ -19,7 +19,7 @@ ;; (sometimes the handler will manage to WAIT3 a process before ;; run-tests WAITPIDs it). -(with-test (:name :run-program-cat-1) +(with-test (:name :run-program-cat-1 :skipped-on :win32) (let* ((process (sb-ext:run-program "/bin/cat" '() :wait nil :output :stream :input :stream)) (out (process-input process)) @@ -31,7 +31,7 @@ (assert (= (read-byte in) i))) (process-close process)))) -(with-test (:name :run-program-cat-2 :skipped-on '(not :sb-thread)) +(with-test (:name :run-program-cat-2 :skipped-on '(or (not :sb-thread) :win32)) ;; Tests that reading from a FIFO is interruptible. (let* ((process (sb-ext:run-program "/bin/cat" '() :wait nil @@ -97,7 +97,7 @@ :start2 start :end2 end) seq)) -(with-test (:name :run-program-cat-3) +(with-test (:name :run-program-cat-3 :skipped-on :win32) ;; User-defined binary input and output streams. (let ((in (make-instance 'buffer-stream)) (out (make-instance 'buffer-stream)) @@ -109,7 +109,7 @@ (assert (= 0 (read-sequence (make-array 8) out))) (assert (equalp buf data))))) -(with-test (:name :run-program-cat-4) +(with-test (:name :run-program-cat-4 :skipped-on :win32) ;; Null broadcast stream as output (let* ((process (sb-ext:run-program "/bin/cat" '() :wait nil :output (make-broadcast-stream) @@ -127,24 +127,26 @@ (require :sb-posix) -(defun make-pipe () - (multiple-value-bind (in out) (sb-posix:pipe) - (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 - :external-format :ascii - :buffering :none :name "out"))) - (make-two-way-stream input output)))) - -(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-5) +#-win32 +(progn + (defun make-pipe () + (multiple-value-bind (in out) (sb-posix:pipe) + (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 + :external-format :ascii + :buffering :none :name "out"))) + (make-two-way-stream input output)))) + + (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-5 :fails-on :win32) (let ((cat (run-program "/bin/cat" nil :input *cat-in* :output *cat-out* :wait nil))) (dolist (test '("This is a test!" @@ -158,48 +160,47 @@ ;;; 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))) - ;; Some eds like to send \r\n - do (unless (eq #\return c) - (write-char c s))))) - -(defun assert-ed (command response) - (when command - (write-line command *ed-in*) - (force-output *ed-in*)) - (when response - (let ((got (read-linish *ed-out*))) - (unless (equal response got) - (error "wanted '~A' from ed, got '~A'" response got)))) - *ed*) - -(unwind-protect - (with-test (:name :run-program-ed) - (assert-ed nil "4") - (assert-ed ".s/bar/baz/g" nil) - (assert-ed "w" "4") - (assert-ed "q" nil) - (process-wait *ed*) - (with-open-file (f *tmpfile*) - (assert (equal "baz" (read-line f))))) - (delete-file *tmpfile*)) +#-win32 +(with-test (:name :is-/bin/ed-installed?) + (assert (probe-file "/bin/ed"))) + +#-win32 +(progn + (defparameter *tmpfile* "run-program-ed-test.tmp") + + (with-test (:name :run-program-/bin/ed) + (with-open-file (f *tmpfile* + :direction :output + :if-exists :supersede) + (write-line "bar" f)) + (unwind-protect + (let* ((ed (run-program "/bin/ed" (list *tmpfile*) :wait nil :pty t)) + (ed-in (process-pty ed)) + (ed-out (process-pty ed))) + (labels ((read-linish (stream) + (with-output-to-string (s) + (loop for c = (read-char stream) + while (and c (not (eq #\newline c))) + ;; Some eds like to send \r\n + do (unless (eq #\return c) + (write-char c s))))) + (assert-ed (command response) + (when command + (write-line command ed-in) + (force-output ed-in)) + (when response + (let ((got (read-linish ed-out))) + (unless (equal response got) + (error "wanted '~A' from ed, got '~A'" response got)))) + ed)) + (assert-ed nil "4") + (assert-ed ".s/bar/baz/g" nil) + (assert-ed "w" "4") + (assert-ed "q" nil) + (process-wait ed) + (with-open-file (f *tmpfile*) + (assert (equal "baz" (read-line f)))))) + (delete-file *tmpfile*)))) ;; #-win32 ;; Around 1.0.12 there was a regression when :INPUT or :OUTPUT was a ;; pathname designator. Since these use the same code, it should @@ -217,7 +218,7 @@ ;;; This used to crash on Darwin and trigger recursive lock errors on ;;; every platform. -(with-test (:name (:run-program :stress)) +(with-test (:name (:run-program :stress) :fails-on :win32) ;; 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 @@ -230,7 +231,7 @@ ("It would be nice if this didn't crash.") :wait nil :output nil))))) -(with-test (:name (:run-program :pty-stream)) +(with-test (:name (:run-program :pty-stream) :fails-on :win32) (assert (equal "OK" (subseq (with-output-to-string (s) @@ -247,7 +248,7 @@ ;; We can't check for the signal itself since run-program.c resets the ;; forked process' signal mask to defaults. But the default is `stop' ;; of which we can be notified asynchronously by providing a status hook. -(with-test (:name (:run-program :inherit-stdin)) +(with-test (:name (:run-program :inherit-stdin) :fails-on :win32) (let (stopped) (flet ((status-hook (proc) (case (sb-ext:process-status proc) @@ -267,7 +268,8 @@ ;; Check that in when you do run-program with :wait t that causes ;; encoding error, it does not affect the following run-program -(with-test (:name (:run-program :clean-exit-after-encoding-error)) +(with-test (:name (:run-program :clean-exit-after-encoding-error) + :fails-on :win32) (let ((had-error-p nil)) (flet ((barf (&optional (format :default)) (with-output-to-string (stream) @@ -307,9 +309,34 @@ (error (e) (princ-to-string e)))))) +#-win32 (with-test (:name (:run-program :if-input-does-not-exist)) (let ((file (pathname (sb-posix:mktemp "rpXXXXXX")))) (assert (null (sb-ext:run-program "/bin/cat" '() :input file))) (assert (null (sb-ext:run-program "/bin/cat" '() :output #.(or *compile-file-truename* *load-truename*) :if-output-exists nil))))) + + +(with-test (:name (:run-program :set-directory)) + (let* ((directory #-win32 "/" + #+win32 "c:\\") + (out (sb-ext:process-output + (sb-ext:run-program #-win32 "/bin/sh" + #-win32 '("-c" "pwd") + #+win32 "cmd.exe" + #+win32 '("/c" "cd") + :output :stream + :directory directory + :search t)))) + (assert + (equal directory + (string-right-trim '(#\Return) (read-line out)))))) + +(with-test (:name (:run-program :directory-nil)) + (sb-ext:run-program #-win32 "/bin/sh" + #-win32 '("-c" "pwd") + #+win32 "cmd.exe" + #+win32 '("/c" "cd") + :directory nil + :search t))