Skip to content
Snippets Groups Projects
Commit 94fec76f authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Fix upgrade test. Tweak other tests for uiop.

parent 7896e94f
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
(with-test () (with-test ()
(register-directory *asdf-directory*) ;; we need asdf-driver, and ECL can dump. (register-directory *asdf-directory*) ;; we need asdf-driver, and ECL can dump.
(register-directory (subpathname *asdf-directory* "uiop/")) (register-directory *uiop-directory*)
(operate 'load-fasl-op :hello-world-example) (operate 'load-fasl-op :hello-world-example)
(operate 'program-op :hello-world-example)) (operate 'program-op :hello-world-example))
...@@ -161,6 +161,8 @@ Some constraints: ...@@ -161,6 +161,8 @@ Some constraints:
(defun back-dir () #-gcl :back #+gcl :parent) (defun back-dir () #-gcl :back #+gcl :parent)
(defparameter *asdf-directory* (defparameter *asdf-directory*
(truename (make-sub-pathname :directory (relative-dir (back-dir)) :defaults *test-directory*))) (truename (make-sub-pathname :directory (relative-dir (back-dir)) :defaults *test-directory*)))
(defparameter *uiop-directory*
(truename (make-sub-pathname :directory (relative-dir "uiop") :defaults *asdf-directory*)))
(defparameter *build-directory* (defparameter *build-directory*
(make-sub-pathname :directory (relative-dir "build") :defaults *asdf-directory*)) (make-sub-pathname :directory (relative-dir "build") :defaults *asdf-directory*))
(defparameter *implementation* (defparameter *implementation*
...@@ -326,6 +328,7 @@ is bound, write a message and exit on an error. If ...@@ -326,6 +328,7 @@ is bound, write a message and exit on an error. If
(defun load-asdf-system (&rest keys) (defun load-asdf-system (&rest keys)
(quietly (quietly
(register-directory *asdf-directory*) (register-directory *asdf-directory*)
(register-directory *uiop-directory*)
(apply (asym :oos) (asym :load-op) :asdf keys))) (apply (asym :oos) (asym :load-op) :asdf keys)))
(defun call-with-asdf-conditions (thunk &optional verbose) (defun call-with-asdf-conditions (thunk &optional verbose)
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
;; Try to load asdf-encodings ;; Try to load asdf-encodings
(setf *central-registry* (setf *central-registry*
(list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF (list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF
(subpathname *asdf-directory* "uiop/") ;; be sure that *OUR* asdf is first of any possible ASDF *uiop-directory* ;; be sure that ouir uiop is there, too.
;; try finding asdf-encodings it right next to asdf. ;; try finding asdf-encodings it right next to asdf.
(subpathname *asdf-directory* "../asdf-encodings/"))) (subpathname *asdf-directory* "../asdf-encodings/")))
(unless (find-system :asdf-encodings nil) (unless (find-system :asdf-encodings nil)
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
;; Try to load lisp-invocation from xcvb ;; Try to load lisp-invocation from xcvb
(setf *central-registry* (setf *central-registry*
(list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF (list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF
(subpathname *asdf-directory* "uiop/") *uiop-directory*
;; try finding xcvb's lisp-invocation right next to asdf. ;; try finding xcvb's lisp-invocation right next to asdf.
(subpathname *asdf-directory* "../xcvb/"))) (subpathname *asdf-directory* "../xcvb/")))
(unless (find-system :lisp-invocation nil) (unless (find-system :lisp-invocation nil)
......
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
(initialize-source-registry (initialize-source-registry
`(:source-registry `(:source-registry
(:directory ,*asdf-directory*) (:directory ,*asdf-directory*)
(:directory ,(subpathname *asdf-directory* "uiop/")) (:directory ,*uiop-directory*)
:ignore-inherited-configuration)) :ignore-inherited-configuration))
(load-system :asdf) (load-system :asdf)
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