diff --git a/test/test-nested-components-1.asd b/test/test-nested-components-1.asd deleted file mode 100644 index d0930b0d39a8b77af97392103614a3b713604dab..0000000000000000000000000000000000000000 --- a/test/test-nested-components-1.asd +++ /dev/null @@ -1,22 +0,0 @@ -;;; -*- Mode: common-lisp; Syntax: Common-Lisp; -*- - -(defsystem test-nested-components-a - :components - ((:module "nested-components" - :pathname "" - :components ((:file "test-nested-1"))))) - -(defsystem test-nested-components-b - :pathname "" - :components - ((:file "test-nested-1"))) - -(defsystem db-agraph-preflight - :components - ((:module "preflight-checks" - :components ((:file "preflight"))))) - -(defsystem db-agraph-preflight-2 - :pathname "preflight-checks" - :components - ((:file "preflight"))) diff --git a/test/test-nested-components.script b/test/test-nested-components.script index fc793c9050170ce1b45c0ed6e72459e1faecaa56..d9793d340d1a65514478598a2d423b302e84db1c 100644 --- a/test/test-nested-components.script +++ b/test/test-nested-components.script @@ -2,10 +2,27 @@ ;;; check that added nesting via modules doesn't confuse ASDF -(setf *central-registry* nil) -(load "test-nested-components-1.asd") +(def-test-system test-nested-components-a + :components + ((:module "nested-components" + :pathname "" + :components ((:file "test-nested-1"))))) -(print +(def-test-system test-nested-components-b + :components + ((:file "test-nested-1"))) + +(def-test-system db-agraph-preflight + :components + ((:module "preflight-checks" + :components ((:file "preflight"))))) + +(defsystem db-agraph-preflight-2 + :pathname "preflight-checks" :source-file nil + :components + ((:file "preflight"))) + +(writeln (list :a (traverse 'compile-op 'test-nested-components-a) @@ -18,7 +35,7 @@ (oos 'compile-op 'test-nested-components-a) (oos 'compile-op 'test-nested-components-b) -(print +(writeln (list (traverse 'load-op 'test-nested-components-a) (traverse 'load-op 'test-nested-components-b)))