Commit 026ceaea authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Fix two tests on ABCL

parent 1b0b2b5a
...@@ -203,18 +203,23 @@ ...@@ -203,18 +203,23 @@
(DBG "cleaning up") (DBG "cleaning up")
(clear-fasls defsystem)) (clear-fasls defsystem))
;; The test should work on ASDF3 and later:
(cond ;; (this is THE bug that motivated the rewrite from ASDF 2 to ASDF 3).
#+asdf3 ;; TODO: figure out why ABCL and XCL fail to recompile anything. (nest
((and #+(or abcl xcl) (use-cache-p :asdf)) #-asdf3 (signals error)
(test-defsystem :asdf)) ;; TODO: figure out why ABCL and XCL require this with-asdf-session.
(t (signals error (test-defsystem :asdf)))) #+(and asdf3.3 (or abcl xcl)) (with-asdf-session () (load-system "asdf"))
(test-defsystem :asdf))
;; Genera's and Lispworks' defsystem have a bug fix, though
;; users need to manually specify non-default dependencies
#+(or genera lispworks) #+(or genera lispworks)
(test-defsystem :native) (test-defsystem :native)
;; Allegro's defsystem has the bug
#+(or allegro) #+(or allegro)
(signals error (test-defsystem :native)) (signals error (test-defsystem :native))
#+mkdefsystem ;; MK-DEFSYSTEM has the bug
#+mk-defsystem
(signals error (test-defsystem :mk-defsystem)) (signals error (test-defsystem :mk-defsystem))
...@@ -5,14 +5,17 @@ ...@@ -5,14 +5,17 @@
(defun current-system-source-file (x) (defun current-system-source-file (x)
(system-source-file (asdf::registered-system x))) (system-source-file (asdf::registered-system x)))
#+abcl (setf jvm::*resignal-compiler-warnings* t)
(with-asdf-session (:override t) (with-asdf-session (:override t)
(terpri) (terpri)
(DBG "Loading test-mutual-redefinition-1") (DBG "Loading test-mutual-redefinition-1")
(let ((warned-p nil)) (let ((warned-p nil))
(handler-bind ((bad-system-name (lambda (c) (handler-bind ((bad-system-name (lambda (c)
(setf warned-p t)
(format t "Caught bad-system-name condition: ~A~%" c)
(assert-equal (component-name c) "test-mutual-redefinition-2") (assert-equal (component-name c) "test-mutual-redefinition-2")
(assert-equal (pathname-name (system-source-file c)) "test-mutual-redefinition-1") (assert-equal (pathname-name (system-source-file c)) "test-mutual-redefinition-1"))))
(setf warned-p t))))
(load-system 'test-mutual-redefinition-1)) (load-system 'test-mutual-redefinition-1))
(assert warned-p)) (assert warned-p))
(assert-pathname-equal (assert-pathname-equal
...@@ -27,9 +30,10 @@ ...@@ -27,9 +30,10 @@
Looking for its definition should trigger a DEFINE-OP and cause the asd paths to be affected.") Looking for its definition should trigger a DEFINE-OP and cause the asd paths to be affected.")
(let ((warned-p nil)) (let ((warned-p nil))
(handler-bind ((bad-system-name (lambda (c) (handler-bind ((bad-system-name (lambda (c)
(setf warned-p t)
(format t "Caught bad-system-name condition: ~A~%" c)
(assert-equal (component-name c) "test-mutual-redefinition-1") (assert-equal (component-name c) "test-mutual-redefinition-1")
(assert-equal (pathname-name (system-source-file c)) "test-mutual-redefinition-2") (assert-equal (pathname-name (system-source-file c)) "test-mutual-redefinition-2"))))
(setf warned-p t))))
(load-system 'test-mutual-redefinition-2)) (load-system 'test-mutual-redefinition-2))
(assert warned-p)) (assert warned-p))
(assert-pathname-equal (assert-pathname-equal
......
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