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

Test tweaks.

parent 660e42c8
No related branches found
No related tags found
No related merge requests found
...@@ -105,12 +105,14 @@ test-upgrade: ...@@ -105,12 +105,14 @@ test-upgrade:
echo "Testing upgrade from ASDF $${tag} using method $$x" ; \ echo "Testing upgrade from ASDF $${tag} using method $$x" ; \
git show $${tag}:asdf.lisp > tmp/asdf-$${tag}.lisp ; \ git show $${tag}:asdf.lisp > tmp/asdf-$${tag}.lisp ; \
case ${lisp}:$$tag:$$x in \ case ${lisp}:$$tag:$$x in \
ecl:1.*|ecl:2.00*|ecl:2.01[0-6]:*|ecl:2.20:*) \
: Skip, because of various ASDF issues ;; \
ccl:1.*|ccl:2.0[01]*) \ ccl:1.*|ccl:2.0[01]*) \
: Skip, because ccl broke old asdf ;; \ : Skip, because ccl broke old asdf ;; \
cmucl:1.*|cmucl:2.00*|cmucl:2.01[0-4]:*) \ cmucl:1.*|cmucl:2.00*|cmucl:2.01[0-4]:*) \
: Skip, CMUCL has problems before 2.014.7 due to source-registry upgrade ;; \ : Skip, CMUCL has problems before 2.014.7 due to source-registry upgrade ;; \
ecl:1.*|ecl:2.0[01]*|ecl:2.20:*) \
: Skip, because of various ASDF issues ;; \
mkcl:1.*|mkcl:2.0[01]*|mkcl:2.2[0-3]:*) \
: Skip, because MKCL is only supported starting with 2.24 ;; \
*) (set -x ; \ *) (set -x ; \
case $$x in \ case $$x in \
load-system) l="$$lo (asdf-test::load-asdf-system)" ;; \ load-system) l="$$lo (asdf-test::load-asdf-system)" ;; \
......
...@@ -152,15 +152,17 @@ is bound, write a message and exit on an error. If ...@@ -152,15 +152,17 @@ is bound, write a message and exit on an error. If
(defun register-directory (dir) (defun register-directory (dir)
(pushnew dir (symbol-value (find-symbol (string :*central-registry*) :asdf)))) (pushnew dir (symbol-value (find-symbol (string :*central-registry*) :asdf))))
(defun asdf-load (x) (defun asdf-load (x &key verbose)
(let ((xoos (find-symbol (string :oos) :asdf)) (let ((xoos (find-symbol (string :oos) :asdf))
(xload-op (find-symbol (string :load-op) :asdf))) (xload-op (find-symbol (string :load-op) :asdf))
(funcall xoos xload-op x :verbose t))) (*load-print* verbose)
(*load-verbose* verbose))
(funcall xoos xload-op x :verbose verbose)))
(defun load-asdf-system () (defun load-asdf-system (&rest keys)
(quietly (quietly
(register-directory *asdf-directory*) (register-directory *asdf-directory*)
(asdf-load :asdf))) (apply 'asdf-load :asdf keys)))
(defun testing-asdf (thunk) (defun testing-asdf (thunk)
(quit-on-error (quit-on-error
......
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