Commit c8e2e0ad authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Tests: Fix bad interaction between upgrade from old asdf+uiop tests and use-package.

parent f7b85d99
......@@ -2,6 +2,7 @@
#+lispworks (lispworks:load-all-patches)
(load (make-pathname :name "script-support" :defaults *load-pathname*))
(load-asdf)
(asdf-test::frob-packages)
#+ecl (require :cmp)
(with-test ()
......
#!/bin/sh
# do_tests {lisp invocation} {scripts-regex}
# run-tests {lisp invocation} {scripts-regex}
# - read lisp forms one at a time from standard input
# - quit with exit status 0 on getting eof
# - quit with exit status >0 if an unhandled error occurs
......@@ -77,7 +77,7 @@ kwote () { ( set +x
) }
DO () { kwote "$@" ; "$@" ; }
do_tests() {
do_tests () {
if [ -z "$*" ]; then
scripts="*.script"
else
......@@ -105,7 +105,7 @@ do_tests() {
echo "Testing: $i" >&2
test_count=`expr "$test_count" + 1`
rm -f ~/.cache/common-lisp/"`pwd`"/* || true
if DO $cmd $debugp $eval "(load \"script-support.lisp\")" $eval "(asdf-test::load-asdf)" $eval "(asdf-test::with-test () (load \"$i\"))" ; then
if DO $cmd $debugp $eval "(load \"script-support.lisp\")" $eval "(progn (asdf-test::load-asdf) (asdf-test::frob-packages) (asdf-test::with-test () (load \"$i\")))" ; then
echo "Using $command, $i passed" >&2
test_pass=`expr "$test_pass" + 1`
else
......
......@@ -510,6 +510,9 @@ is bound, write a message and exit on an error. If
(pathname-components *test-directory*)
(pathname-components x)))
(setf *test-directory* x)))
t)
(defun frob-packages ()
(format t "Frob packages~%")
(use-package :asdf :asdf-test)
(when (find-package :asdf/driver) (use-package :asdf/driver :asdf-test))
......@@ -517,6 +520,7 @@ is bound, write a message and exit on an error. If
(setf *package* (find-package :asdf-test))
t)
(defun load-asdf-lisp-and-test-uiop (&optional tag)
(load-asdf-lisp tag)
(configure-asdf)
......
......@@ -172,3 +172,5 @@
:from-end t))
(assert-equal nil (fishy-asdf-exported-symbols))
(delete-package* :asdf-test-package-1)
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