Loading test/test-multiple.script +10 −8 Original line number Diff line number Diff line Loading @@ -7,13 +7,15 @@ (setf *central-registry* `(,*test-directory* ,tmp)) ;; Don't rely on ln -s on Windows (unless (os-windows-p) (cond ((os-unix-p) (run-program (format nil "ln -sf ~A ~A" (native-namestring asd) (native-namestring asd2))) (oos 'load-source-op 'test-multiple-too) (assert (asymval :*file3* :test-package))) (oos 'load-source-op 'test-multiple-too)) (t (oos 'load-source-op 'test-multiple))) (assert (asymval :*file3* :test-package)) (load-system 'test-multiple-free) (assert (probe-file* file4)) test/test-run-program.script +15 −10 Original line number Diff line number Diff line Loading @@ -25,21 +25,26 @@ (unless (equal 0 (run-shell-command "./good-shell-command")) (error "Failed to capture exit status indicating shell command success."))) ;; On Windows, normalize away CRLF into jut the unixy LF. (defun remove-cr (x) (remove (code-char 13) x)) (DBG "Testing awkward legacy output capture via run-shell-command") (let ((ok1 (format nil "; $ echo ok 1~%ok 1~%"))) (assert-equal (remove-cr (with-output-to-string (s) (let ((*verbose-out* s)) (run-shell-command "echo ~A 1" "ok"))) (run-shell-command "echo ~A 1" "ok")))) ok1) #-ecl (assert-equal (remove-cr (with-output-to-string (s) (let ((*verbose-out* t) (*standard-output* s)) (let ((status (run-shell-command "echo ok ~D" 1))) (unless (zerop status) (error "Didn't get good exit status."))))) (error "Didn't get good exit status.")))))) ok1)) ;; NB1: run-shell-command is deprecated. Use run-program instead. Loading @@ -48,7 +53,7 @@ (assert-equal '("ok 1") (run-program "echo ok 1" :output :lines)) (assert-equal "ok 1" (run-program '("echo" "ok 1") :output :line)) (assert-equal '(:ok 1) (run-program '("echo" ":ok 1") :output :forms)) (assert-equal (format nil "ok 1~%") (run-program '("echo" "ok 1") :output :string)) (assert-equal (format nil "ok 1~%") (remove-cr (run-program '("echo" "ok 1") :output :string))) ;; this test checks for a problem there was in allegro -- :output :interactive ;; would try to open T as a stream for INPUT. (assert-equal 0 (run-program "true" :force-shell t :output :interactive)) Loading Loading
test/test-multiple.script +10 −8 Original line number Diff line number Diff line Loading @@ -7,13 +7,15 @@ (setf *central-registry* `(,*test-directory* ,tmp)) ;; Don't rely on ln -s on Windows (unless (os-windows-p) (cond ((os-unix-p) (run-program (format nil "ln -sf ~A ~A" (native-namestring asd) (native-namestring asd2))) (oos 'load-source-op 'test-multiple-too) (assert (asymval :*file3* :test-package))) (oos 'load-source-op 'test-multiple-too)) (t (oos 'load-source-op 'test-multiple))) (assert (asymval :*file3* :test-package)) (load-system 'test-multiple-free) (assert (probe-file* file4))
test/test-run-program.script +15 −10 Original line number Diff line number Diff line Loading @@ -25,21 +25,26 @@ (unless (equal 0 (run-shell-command "./good-shell-command")) (error "Failed to capture exit status indicating shell command success."))) ;; On Windows, normalize away CRLF into jut the unixy LF. (defun remove-cr (x) (remove (code-char 13) x)) (DBG "Testing awkward legacy output capture via run-shell-command") (let ((ok1 (format nil "; $ echo ok 1~%ok 1~%"))) (assert-equal (remove-cr (with-output-to-string (s) (let ((*verbose-out* s)) (run-shell-command "echo ~A 1" "ok"))) (run-shell-command "echo ~A 1" "ok")))) ok1) #-ecl (assert-equal (remove-cr (with-output-to-string (s) (let ((*verbose-out* t) (*standard-output* s)) (let ((status (run-shell-command "echo ok ~D" 1))) (unless (zerop status) (error "Didn't get good exit status."))))) (error "Didn't get good exit status.")))))) ok1)) ;; NB1: run-shell-command is deprecated. Use run-program instead. Loading @@ -48,7 +53,7 @@ (assert-equal '("ok 1") (run-program "echo ok 1" :output :lines)) (assert-equal "ok 1" (run-program '("echo" "ok 1") :output :line)) (assert-equal '(:ok 1) (run-program '("echo" ":ok 1") :output :forms)) (assert-equal (format nil "ok 1~%") (run-program '("echo" "ok 1") :output :string)) (assert-equal (format nil "ok 1~%") (remove-cr (run-program '("echo" "ok 1") :output :string))) ;; this test checks for a problem there was in allegro -- :output :interactive ;; would try to open T as a stream for INPUT. (assert-equal 0 (run-program "true" :force-shell t :output :interactive)) Loading