Commit 1dc783cb authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Merge branch 'master' into minimakefile

parents bea63053 3a5927e6
Subproject commit e662d591ab46550e08863dae1baaa65312fd38a6 Subproject commit 91028c53573d590bce36d99c9cdf97008a5c2ad9
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
(defun make-hello-bundle (operation) (defun make-hello-bundle (operation)
(operate 'load-bundle-op :hello-world-example) (operate 'load-bundle-op :hello-world-example)
(operate operation :hello-world-example) (operate operation :hello-world-example)
#+mkcl (add-mkcl-dll (asdf::output-file operation :hello-world-example))) #+mkcl (add-mkcl-dll (asdf::output-file operation :hello-world-example))
(quit 0))
(defun make-hello-image () (defun make-hello-image ()
(make-hello-bundle 'image-op)) (make-hello-bundle 'image-op))
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#+allegro :lisp-path #+allegro *lisp* #+allegro :lisp-path #+allegro *lisp*
:cross-compile nil :cross-compile nil
: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)
:run-program-args :run-program-args
`(:input nil :ignore-error-status t `(:input nil :ignore-error-status t
:output (,*standard-output* :linewise t :prefix "stdout: ") :output (,*standard-output* :linewise t :prefix "stdout: ")
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
(make-hello-world 'image) (make-hello-world 'image)
(assert (probe-file* img) () "Can't find image file ~S" img) (assert (probe-file* img) () "Can't find image file ~S" img)
(DBG "- then, use it") (DBG "- then use this executable image")
(assert-equal (assert-equal
(nest (nest
#+lispworks (last) #+lispworks (last)
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
:run-program-args '(:output :lines :error-output t))) :run-program-args '(:output :lines :error-output t)))
'("hello, world")) '("hello, world"))
(DBG "- now, use it with arguments") (DBG "- now, use this executable image with arguments")
#-(or lispworks scl) ;; These can't be passed arguments the normal way #-(or lispworks scl) ;; These can't be passed arguments the normal way
(assert-equal (assert-equal
(lisp-invocation:invoke-lisp (lisp-invocation:invoke-lisp
...@@ -102,11 +102,11 @@ ...@@ -102,11 +102,11 @@
(make-hello-world 'program) (make-hello-world 'program)
(assert (probe-file* exe) () "Can't find executable file ~S" exe) (assert (probe-file* exe) () "Can't find executable file ~S" exe)
(DBG "- use that") (DBG "- use that standalone program")
(assert-equal (run-program `(,(native-namestring exe)) :output :lines :error-output t) (assert-equal (run-program `(,(native-namestring exe)) :output :lines :error-output t)
'("hello, world")) '("hello, world"))
(DBG "- use that with arguments") (DBG "- use that standalone program with arguments")
(assert-equal (run-program `(,(native-namestring exe) "a" "b c" "d") :output :lines :error-output t) (assert-equal (run-program `(,(native-namestring exe) "a" "b c" "d") :output :lines :error-output t)
'("hello, world" '("hello, world"
"You passed 3 arguments:" "You passed 3 arguments:"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment