Commit 039e7025 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Merge branch 'master' into minimakefile

parents 0ed8785d 405e2b37
Subproject commit 177b6ae66cf2f96a2560e80ce2622136fd7179a1 Subproject commit ca2d344357d32973ed342ae4955b4ac153262189
closer-closer-mop @ ea8e7023
Subproject commit 1bd37b7dd7671ee174f9c00a2490c00c35c3a28e Subproject commit ea8e7023f84e247e1b96cfd8c3831741a58d2b9e
Subproject commit 9d1a4930b4da48030bb74a80db443b6ec4254712 Subproject commit 0a55ecc11cf564a13f443dd8916d00449b100636
...@@ -9,12 +9,6 @@ ...@@ -9,12 +9,6 @@
(trace run-program #+(and sbcl os-windows) sb-ext:run-program) (trace run-program #+(and sbcl os-windows) sb-ext:run-program)
#+allegro
(defparameter *lisp*
(let ((argv0 (parse-native-namestring (first (raw-command-line-arguments)))))
(or (absolute-pathname-p argv0)
(truename (subpathname #p"sys:" argv0)))))
;; Try to load lisp-invocation from xcvb ;; Try to load lisp-invocation from xcvb
(initialize-source-registry (initialize-source-registry
`(:source-registry `(:source-registry
...@@ -24,7 +18,7 @@ ...@@ -24,7 +18,7 @@
:inherit-configuration)) :inherit-configuration))
(unless (find-system :lisp-invocation nil) (unless (find-system :lisp-invocation nil)
(leave-test "Couldn't find lisp-invocation. Probably your ASDF ext/ directory needs submodule update." 1)) (leave-test "Couldn't find lisp-invocation. Probably your ASDF ext/ directory needs submodule update." 1))
(unless (version-satisfies (find-system "lisp-invocation") "1.0.11") (unless (version-satisfies (find-system "lisp-invocation") "1.0.12")
(leave-test "Lisp-invocation library isn't new enough to test successfully. Probably your ASDF ext/ directory needs submodule update." 1)) (leave-test "Lisp-invocation library isn't new enough to test successfully. Probably your ASDF ext/ directory needs submodule update." 1))
(load-system "lisp-invocation/all") (load-system "lisp-invocation/all")
;; Disable any user source registry. ;; Disable any user source registry.
...@@ -35,7 +29,7 @@ ...@@ -35,7 +29,7 @@
0 0
(nth-value 2 (nth-value 2
(lisp-invocation:invoke-lisp (lisp-invocation:invoke-lisp
#+allegro :lisp-path #+allegro *lisp* :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant)
: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)
...@@ -62,7 +56,7 @@ ...@@ -62,7 +56,7 @@
(nest (nest
#+lispworks (last) #+lispworks (last)
(lisp-invocation:invoke-lisp (lisp-invocation:invoke-lisp
#+allegro :lisp-path #+allegro *lisp* :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant)
:cross-compile nil :cross-compile nil
: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)"
...@@ -73,7 +67,7 @@ ...@@ -73,7 +67,7 @@
#-(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
#+allegro :lisp-path #+allegro *lisp* :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant)
:image-path (native-namestring img) :image-path (native-namestring img)
:cross-compile nil :cross-compile nil
:eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)" :eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)"
......
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