diff --git a/shop3/shop-silent-test.asd b/shop3/shop-silent-test.asd deleted file mode 100644 index dc6d4091..00000000 --- a/shop3/shop-silent-test.asd +++ /dev/null @@ -1,3 +0,0 @@ -(defsystem shop-silent-test - :depends-on ((:version "fiveam-asdf" "2")) - :components ((:file "silent-shop-test"))) diff --git a/shop3/shop3.asd b/shop3/shop3.asd index f4289455..01426a7b 100644 --- a/shop3/shop3.asd +++ b/shop3/shop3.asd @@ -211,8 +211,8 @@ minimal affected subtree." (defsystem shop3/test - :defsystem-depends-on ("shop-silent-test") - :class "silent-shop-test:shop-fiveam-tester" + :defsystem-depends-on ((:version "fiveam-asdf" "2")) + :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 @@ -356,8 +356,8 @@ minimal affected subtree." (defsystem shop3/test-satellite - :defsystem-depends-on ("shop-silent-test") - :class "silent-shop-test:shop-fiveam-tester" + :defsystem-depends-on ((:version "fiveam-asdf" "2")) + :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")) @@ -368,8 +368,8 @@ minimal affected subtree." :components ((:file "test-satellite"))) (defsystem shop3/test-unifier - :defsystem-depends-on ("shop-silent-test") - :class "silent-shop-test:shop-fiveam-tester" + :defsystem-depends-on ((:version "fiveam-asdf" "2")) + :class "fiveam-asdf:fiveam-tester-system" :test-names (("TEST-SHOP-UNIFIER" . "SHOP-UNIFIER-TESTS")) :num-checks 36 :depends-on ("shop3/unifier" "alexandria") diff --git a/shop3/silent-shop-test.lisp b/shop3/silent-shop-test.lisp deleted file mode 100644 index eeb852a2..00000000 --- a/shop3/silent-shop-test.lisp +++ /dev/null @@ -1,17 +0,0 @@ -(defpackage :silent-shop-test - (:use :asdf :common-lisp) - (:export #:shop-fiveam-tester)) - -(in-package #:silent-shop-test) - - -(defclass shop-tester-mixin () - () - (:documentation "Mixin that adds silent functioning of SHOP3.")) - -(defclass shop-fiveam-tester (shop-tester-mixin fiveam-tester-system) ()) - -(defmethod perform :around ((op test-op) - (component shop-tester-mixin)) - (progv (list (uiop:intern* '#:*silent* '#:shop)) - (call-next-method)))