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

Test improvements.

Be more selective in what warnings get quashed when upgrading ASDF.
Skip bundle test on ABCL, ECL-bytecodes.
Sleep more in test1.
parent 2767d63f
......@@ -105,7 +105,7 @@ test-upgrade:
for tag in 1.37 1.97 1.369 `git tag -l '2.0??'` `git tag -l '2.??'` ; do \
rm -f $$fa ; \
for x in load-system load-lisp load-lisp-compile-load-fasl load-fasl just-load-fasl ; do \
lo="(handler-bind ((warning #'muffle-warning)) (load \"tmp/asdf-$${tag}.lisp\"))" ; \
lo="(asdf-test::load-old-asdf \"$${tag}\")" ; \
echo "Testing upgrade from ASDF $${tag} using method $$x" ; \
git show $${tag}:asdf.lisp > tmp/asdf-$${tag}.lisp ; \
case ${lisp}:$$tag:$$x in \
......
......@@ -53,6 +53,16 @@
:defaults *asdf-directory*)
*asdf-lisp*))))
(defun load-old-asdf (tag)
(let ((old-asdf
(merge-pathnames
(make-pathname :directory `(:relative "tmp")
:name (format nil "asdf-~A" tag)
:defaults *asdf-directory*)
*asdf-lisp*)))
(handler-bind (#+sbcl (sb-kernel:redefinition-warning #'muffle-warning))
(load old-asdf))))
(defun load-asdf ()
(load *asdf-fasl*)
(use-package :asdf :asdf-test)
......
......@@ -14,7 +14,7 @@
(when (find-package :test-package) (delete-package :test-package))
(asdf:defsystem :test-bundle-1 :components ((:file "file1") (:file "file3")))
(asdf:defsystem :test-bundle-2 :depends-on (:test-bundle-1) :components ((:file "file2")))
#-(and ecl ecl-bytecmp)
#-(or abcl (and ecl ecl-bytecmp))
(let* ((op (make-instance 'asdf::fasl-op))
(bundle-1 (asdf:output-file op (find-system :test-bundle-1)))
(bundle-2 (asdf:output-file op (find-system :test-bundle-2))))
......
......@@ -19,9 +19,9 @@
(assert (symbol-value (find-symbol (symbol-name :*file1*) :test-package)))
(DBG "now remove file2 that depends-on file1 check that file1 is _not_ recompiled, but file2 is")
(asdf::run-shell-command "rm -f ~A" (namestring file2))
(asdf::delete-file-if-exists file2)
;; filesystem mtime has 1 second granularity. Make sure even fast machines see a difference.
(sleep 1)
(sleep 1.5)
(asdf:operate 'asdf:load-op 'test1)
(assert (= file1-date (file-write-date file1)))
(assert (< file2-date (file-write-date file2)))
......
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