X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-program.test.sh;h=03778521bce05af1be75da7c6ee2a808ed2f7b3c;hb=ae026fe85fef157ff42d6655e5f5e4eef74709f1;hp=b95931a420ee536fbbac919efdf2cb8e34be30f7;hpb=04d819bb1a2e64de4e997203b9516229bb73c686;p=sbcl.git

diff --git a/tests/run-program.test.sh b/tests/run-program.test.sh
index b95931a..0377852 100644
--- a/tests/run-program.test.sh
+++ b/tests/run-program.test.sh
@@ -13,6 +13,8 @@
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
 
+. ./subr.sh
+
 # Make sure that there's at least something in the environment (for
 # one of the tests below).
 SOMETHING_IN_THE_ENVIRONMENT='yes there is'
@@ -20,7 +22,8 @@ export SOMETHING_IN_THE_ENVIRONMENT
 PATH=/some/path/that/does/not/exist:${PATH}
 export PATH
 
-${SBCL:-sbcl} <<EOF
+# This should probably be broken up into separate pieces.
+run_sbcl --eval "(defvar *exit-ok* $EXIT_LISP_WIN)" <<'EOF'
   ;; test that $PATH is searched
   (assert (zerop (sb-ext:process-exit-code
                   (sb-ext:run-program "true" () :search t :wait t))))
@@ -38,8 +41,26 @@ ${SBCL:-sbcl} <<EOF
                   (sb-ext:run-program "/usr/bin/env" ()
                                       :output stream
                                       :environment '("FEEFIE=foefum")))))
-    (assert (string= string "FEEFIE=foefum
+    (assert (equal string "FEEFIE=foefum
 ")))
+
+ ;; Unicode strings
+ (flet ((try (sb-impl::*default-external-format* x y)
+         (let* ((process (run-program
+                          "/bin/sh" (list "-c" (format nil "echo ~c, $SB_TEST_FOO." x))
+                          :environment (list (format nil "SB_TEST_FOO=~c" y))
+                          :output :stream
+                          :wait t))
+                (output (read-line (process-output process)))
+                (wanted (format nil "~c, ~c." x y)))
+           (unless (equal output wanted)
+             (error "wanted ~S, got ~S" wanted output))
+           (process-close process))))
+   (try :ascii #\s #\b)
+   (try :latin-1 (code-char 197) (code-char 229))
+   #+sb-unicode
+   (try :utf-8 #\GREEK_CAPITAL_LETTER_OMEGA #\GREEK_SMALL_LETTER_OMEGA))
+
   ;; The default Unix environment for the subprocess is the same as
   ;; for the parent process. (I.e., we behave like perl and lots of
   ;; other programs, but not like CMU CL.)
@@ -64,13 +85,29 @@ ${SBCL:-sbcl} <<EOF
                                         :input i :output stream)))))
     (assert (= (length string) 6))
     (assert (string= string "abcdef")))
+
+  ;;; Test the bookkeeping involved in decoding the child's output:
+
+  ;; repeated short, properly-encoded reads exposed one bug.  (But
+  ;; note: this test will be inconclusive if the child's stderr is
+  ;; fully buffered.)
+  (let ((str (with-output-to-string (s)
+               (run-program "/bin/sh"
+                            '("-c" "(echo Foo; sleep 2; echo Bar)>&2")
+                            :output s :search t :error :output :wait t))))
+    (assert (string= str (format nil "Foo~%Bar~%"))))
+
+  ;; end of file in the middle of a UTF-8 character
+  (typep (nth-value 1 (ignore-errors
+                       (let ((sb-impl::*default-external-format* :utf-8))
+                         (with-output-to-string (s)
+                           (run-program "printf" '("\\316")
+                                        :output s :search t :wait t)))))
+         'error)
+
   ;; success convention for this Lisp program run as part of a larger script
-  (sb-ext:quit :unix-status 52)))
+  (sb-ext:quit :unix-status *exit-ok*)))
 EOF
-if [ $? != 52 ]; then
-    echo test failed: $?
-    exit 1
-fi
+check_status_maybe_lose "run program tests" $?
 
-# success convention
-exit 104
+exit $EXIT_TEST_WIN