Skip to content
Snippets Groups Projects
Commit 0117d8ca authored by Robert P. Goldman's avatar Robert P. Goldman
Browse files

Correctly disable tests on Mac OSX. Fix buglet on Allegro.

Bundle operations don't work on Mac OS X on either lispworks (can't
restart the image properly) or on ECL (build fails, I believe because of
an ECL build bug).
parent d0c367e2
No related branches found
No related tags found
Loading
...@@ -34,15 +34,16 @@ ...@@ -34,15 +34,16 @@
(nth-value 2 (nth-value 2
(run-program (run-program
(symbol-call (symbol-call
#+allegro :lisp-path #+allegro *lisp*
:lisp-invocation :lisp-invocation-arglist :lisp-invocation :lisp-invocation-arglist
#+allegro :lisp-path #+allegro *lisp*
:load (native-namestring (subpathname *test-directory* "make-hello-world.lisp")) :load (native-namestring (subpathname *test-directory* "make-hello-world.lisp"))
:eval (format nil "(asdf-test::make-hello-~a)" kind)) :eval (format nil "(asdf-test::make-hello-~a)" kind))
:input nil :ignore-error-status t :input nil :ignore-error-status t
:output (list *standard-output* :linewise t :prefix "stdout: ") :output (list *standard-output* :linewise t :prefix "stdout: ")
:error-output (list *error-output* :linewise t :prefix "stderr: "))))) :error-output (list *error-output* :linewise t :prefix "stderr: ")))))
#-(and lispworks os-windows) #-(or (and lispworks os-macosx)
(and ecl os-macosx))
(progn (progn
(DBG "test image-op") (DBG "test image-op")
(defparameter img (output-file (make-operation 'image-op) (find-system :hello-world-example))) (defparameter img (output-file (make-operation 'image-op) (find-system :hello-world-example)))
...@@ -58,8 +59,8 @@ ...@@ -58,8 +59,8 @@
#+lispworks (last) #+lispworks (last)
(run-program (run-program
(symbol-call (symbol-call
#+allegro :lisp-path #+allegro *lisp*
:lisp-invocation :lisp-invocation-arglist :lisp-invocation :lisp-invocation-arglist
#+allegro :lisp-path #+allegro *lisp*
:image-path (native-namestring img) :image-path (native-namestring img)
:eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)") :eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)")
:output :lines :error-output t)) :output :lines :error-output t))
...@@ -70,8 +71,8 @@ ...@@ -70,8 +71,8 @@
(assert-equal (assert-equal
(run-program (run-program
(symbol-call (symbol-call
#+allegro :lisp-path #+allegro *lisp*
:lisp-invocation :lisp-invocation-arglist :lisp-invocation :lisp-invocation-arglist
#+allegro :lisp-path #+allegro *lisp*
:image-path (native-namestring img) :image-path (native-namestring img)
:eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)" :eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)"
:arguments '("a" "b c" "d")) :arguments '("a" "b c" "d"))
...@@ -82,6 +83,8 @@ ...@@ -82,6 +83,8 @@
" \"b c\"" " \"b c\""
" \"d\""))) " \"d\"")))
#-(or (and lispworks os-macosx)
(and ecl os-macosx))
(progn (progn
(DBG "test program-op") (DBG "test program-op")
(unless (or #+(or clisp clozure (and ecl (not ecl-bytecmp)) lispworks mkcl sbcl) t (unless (or #+(or clisp clozure (and ecl (not ecl-bytecmp)) lispworks mkcl sbcl) t
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment