X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-program.impure.lisp;h=0088c56d6581d927884acc031b02bb88fc9cbd03;hb=062283b901155792f65775491aea51481c56faaa;hp=d27bb65b1528cd5948bf69d8f05cd65353d2766a;hpb=b67c2d7522c0b73a18e316faa2b81d7c8b187706;p=sbcl.git diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp index d27bb65..0088c56 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,8 +31,7 @@ (assert (= (read-byte in) i))) (process-close process)))) -#+sb-thread -(with-test (:name :run-program-cat-2) +(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 @@ -65,29 +64,89 @@ (sb-thread:join-thread writer) (assert (equal "OK" (read-line out))))) +(defclass buffer-stream (sb-gray:fundamental-binary-input-stream sb-gray:fundamental-binary-output-stream) + ((buffer :initform (make-array 128 + :element-type '(unsigned-byte 8) + :adjustable t + :fill-pointer 0)) + (mark :initform 0))) + +(defmethod stream-element-type ((stream buffer-stream)) + '(unsigned-byte 8)) + +(defmethod sb-gray:stream-read-sequence ((stream buffer-stream) seq &optional (start 0) end) + (let* ((buffer (slot-value stream 'buffer)) + (end (or end (length seq))) + (mark (slot-value stream 'mark)) + (fill-pointer (fill-pointer buffer)) + (new-mark (+ mark (min fill-pointer (- end start))))) + (setf (slot-value stream 'mark) new-mark) + (replace seq buffer + :start1 start :end1 end + :start2 mark :end2 fill-pointer) + (min end (+ start (- fill-pointer mark))))) + +(defmethod sb-gray:stream-write-sequence ((stream buffer-stream) seq &optional (start 0) end) + (let* ((buffer (slot-value stream 'buffer)) + (end (or end (length seq))) + (fill-pointer (fill-pointer buffer)) + (new-fill (min (array-total-size buffer) (+ fill-pointer (- end start))))) + (setf (fill-pointer buffer) new-fill) + (replace buffer seq + :start1 fill-pointer + :start2 start :end2 end) + seq)) + +(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)) + (data #(0 1 2 3 4 5 6 7 8 9 10 11 12))) + (write-sequence data in) + (let ((process (sb-ext:run-program "/bin/cat" '() :wait t :output out :input in)) + (buf (make-array (length data)))) + (assert (= 13 (read-sequence buf out))) + (assert (= 0 (read-sequence (make-array 8) out))) + (assert (equalp buf data))))) + +(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) + :input :stream)) + (in (process-input process))) + (unwind-protect + (progn + (write-string "foobar" in) + (close in) + (process-wait process)) + (process-close process)))) + ;;; Test driving an external program (cat) through pipes wrapped in ;;; composite streams. (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-2) +#-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!" @@ -101,6 +160,9 @@ ;;; 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. +#-win32 (progn ;; kludge: It would be nicer to disable individual test cases, + ;; but we are not using WITH-TEST yet here. + (defparameter *tmpfile* "run-program-ed-test.tmp") (with-open-file (f *tmpfile* @@ -144,6 +206,8 @@ (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 ;; suffice to test just :INPUT. @@ -160,7 +224,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 @@ -173,7 +237,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) @@ -190,7 +254,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) @@ -207,3 +271,70 @@ (process-close proc) (assert (not stopped)))))) + +;; 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) + :fails-on :win32) + (let ((had-error-p nil)) + (flet ((barf (&optional (format :default)) + (with-output-to-string (stream) + (run-program #-netbsd "/usr/bin/perl" #+netbsd "/usr/pkg/bin/perl" + '("-e" "print \"\\x20\\xfe\\xff\\x0a\"") + :output stream + :external-format format))) + (no-barf () + (with-output-to-string (stream) + (run-program "/bin/echo" + '("This is a test") + :output stream)))) + (handler-case + (barf :utf-8) + (error () + (setq had-error-p t))) + (assert had-error-p) + ;; now run the harmless program + (setq had-error-p nil) + (handler-case + (no-barf) + (error () + (setq had-error-p t))) + (assert (not had-error-p))))) + +(with-test (:name (:run-program :no-such-thing)) + (assert (search "Couldn't execute" + (handler-case + (progn (run-program "no-such-program-we-hope" '()) nil) + (error (e) + (princ-to-string e)))))) + +(with-test (:name (:run-program :not-executable)) + (assert (search "Couldn't execute" + (handler-case + (progn (run-program "run-program.impure.lisp" '()) nil) + (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))))))