Skip to content

Commit

Permalink
Fix loading of fiveam-asdf defsystem. (#161)
Browse files Browse the repository at this point in the history
* Fix loading of fiveam-asdf defsystem.

Previously, we were forced to load that system by hand, when reading
the ASDF system definition. By pulling some code out, and by using
strings for class designators in shop3.asd's tester systems, we no
longer have to do this.
  • Loading branch information
rpgoldman authored Feb 14, 2024
1 parent 96ab960 commit 665abaf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 31 deletions.
28 changes: 3 additions & 25 deletions shop3/shop3.asd
Original file line number Diff line number Diff line change
Expand Up @@ -195,27 +195,6 @@ minimal affected subtree."
;;; Testing
;;;---------------------------------------------------------------------------

(asdf:load-system "fiveam-asdf")

(defclass tester-cl-source-file ( cl-file )
()
(:documentation "Special class that will have to recompile no matter
what..."))

(defmethod operation-done-p
((o compile-op)
(c tester-cl-source-file))
"We are crushing the normal operation-done-p for compile-op, so that
the tester files get recompiled, to take into account any changes to
shop3."
(values nil))

(defclass shop-tester-mixin ()
()
(:documentation "Mixin that adds silent functioning of SHOP3."))


(defclass shop-fiveam-tester (shop-tester-mixin fiveam-tester-system) ())

(defsystem shop3/openstacks
:depends-on (:shop3)
Expand All @@ -233,7 +212,7 @@ shop3."

(defsystem shop3/test
:defsystem-depends-on ((:version "fiveam-asdf" "2"))
:class shop-fiveam-tester
:class "fiveam-asdf:fiveam-tester-system"
:test-names ((pddl-tests . :shop3) ; 144
(protection-test . :protection-test) ; 16
;; all the following are now subsumed into all-shop3-internal-tests
Expand Down Expand Up @@ -270,7 +249,6 @@ shop3."
:components ((:file "common")
(:file "warns-check")))

(:file "silent-shop-test")
(:file "theorem-prover-tests"
:pathname "tests/theorem-prover-tests")
(:module "shop-pddl-tests"
Expand Down Expand Up @@ -378,7 +356,7 @@ shop3."

(defsystem shop3/test-satellite
:defsystem-depends-on ((:version "fiveam-asdf" "2"))
:class shop-fiveam-tester
:class "fiveam-asdf:fiveam-tester-system"
:test-names (("SATELLITE-ADL-TESTS" . "TEST-SATELLITE"))
:num-checks 80
:depends-on ((:version "shop3" (:read-file-form "shop-version.lisp-expr"))
Expand All @@ -390,7 +368,7 @@ shop3."

(defsystem shop3/test-unifier
:defsystem-depends-on ((:version "fiveam-asdf" "2"))
:class shop-fiveam-tester
:class "fiveam-asdf:fiveam-tester-system"
:test-names (("TEST-SHOP-UNIFIER" . "SHOP-UNIFIER-TESTS"))
:num-checks 36
:depends-on ("shop3/unifier" "alexandria")
Expand Down
6 changes: 0 additions & 6 deletions shop3/silent-shop-test.lisp

This file was deleted.

0 comments on commit 665abaf

Please sign in to comment.