diff --git a/test/defsystem-depends-on/defsystem-dependency.asd b/test/defsystem-depends-on/defsystem-dependency.asd index 3f7f139c06c6891670ef01e823b814e1be7e5ee0..e6059ad0e7d42337138c8ef5f03c86915e49b321 100644 --- a/test/defsystem-depends-on/defsystem-dependency.asd +++ b/test/defsystem-depends-on/defsystem-dependency.asd @@ -1,3 +1,4 @@ (defsystem "defsystem-dependency" :depends-on ("overlapping-dependency") - :components ((:file "defsystem-dependency"))) + :components ((:file "defsystem-dependency")) + :in-order-to ((test-op (test-op "test-system")))) diff --git a/test/defsystem-depends-on/defsystem-dependency.lisp b/test/defsystem-depends-on/defsystem-dependency.lisp index c391ea4463ee1f5c9a7927182aed795fcc9aa16d..0442efc702e424c5f2f9bfea451c8bd5db851126 100644 --- a/test/defsystem-depends-on/defsystem-dependency.lisp +++ b/test/defsystem-depends-on/defsystem-dependency.lisp @@ -1,3 +1,5 @@ (in-package :asdf-test) (defvar *dd* 0) (incf *dd*) +(format t "Loaded defsystem-dependency.lisp ~d time~(~:*~p~)~%" *dd*) +(setf (find-class 'asdf::my-cl-source-file) (find-class 'cl-source-file)) diff --git a/test/defsystem-depends-on/intermediate-dependency.asd b/test/defsystem-depends-on/intermediate-dependency.asd index caf4ef95c8becfc730e53562f7669441f100c579..dbb020e4533c2b0121905178adad004322370678 100644 --- a/test/defsystem-depends-on/intermediate-dependency.asd +++ b/test/defsystem-depends-on/intermediate-dependency.asd @@ -1,3 +1,3 @@ (defsystem "intermediate-dependency" :defsystem-depends-on ("defsystem-dependency") - :components ((:file "intermediate-dependency"))) + :components ((:my-cl-source-file "intermediate-dependency"))) diff --git a/test/defsystem-depends-on/test-system.asd b/test/defsystem-depends-on/test-system.asd new file mode 100644 index 0000000000000000000000000000000000000000..9d3b24b5c3636358c5dc09c7f211c66def58bc59 --- /dev/null +++ b/test/defsystem-depends-on/test-system.asd @@ -0,0 +1,4 @@ +(defsystem "test-system" + :defsystem-depends-on ("defsystem-dependency") + :components ((:my-cl-source-file "test-system")) + :perform (test-op (o c) (symbol-call :asdf-test :run-test))) diff --git a/test/defsystem-depends-on/test-system.lisp b/test/defsystem-depends-on/test-system.lisp new file mode 100644 index 0000000000000000000000000000000000000000..814acde71afc57076456960217426dc899c134a0 --- /dev/null +++ b/test/defsystem-depends-on/test-system.lisp @@ -0,0 +1,7 @@ +(in-package :asdf-test) + +(setf *dd* 10) + +(defun run-test () + (format t "Running tests...") + t) diff --git a/test/test-defsystem-depends-on-phase-overlap.script b/test/test-defsystem-depends-on-phase-overlap.script index f4147b47721d74c9ae3abc3ba656609bfdbed1d4..d1322402bdc5735e44f78a4cc8b3163aa38a9749 100644 --- a/test/test-defsystem-depends-on-phase-overlap.script +++ b/test/test-defsystem-depends-on-phase-overlap.script @@ -1,7 +1,5 @@ ;;-*- Lisp -*- -;; TODO: make it files, so that DEFINE-OP can propagate and cause reloading. - (in-package :asdf-test) (setf *central-registry* (list (subpathname *test-directory* "defsystem-depends-on/"))) @@ -45,3 +43,13 @@ (with-asdf-session (:override t) (load-system "main-system" :force '("overlapping-dependency"))) (assert-equal (list *od* *dd* *id* *ms*) '(1 1 1 1)) + +(DBG "actions marked as needed at one level should still be planned if needed at a higher level") +(reset-vars) +(setf (find-class 'asdf::my-cl-source-file) nil) +(asdf::clear-registered-systems) +(assert-equal *dd* 0) +(with-asdf-session (:override t) + (test-system "defsystem-dependency")) +(assert-equal *dd* 10) +