Improve test suite for modern ASDF

diff --git a/debian/changelog b/debian/changelog
index ea1dee2e1b552b03b7ce6e59bb9b5a26d202d527..1eab622a6feb8a3e5fac157f01e69a9bff5d1373 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-puri (1:1.5.7.1-1) unstable; urgency=medium
+
+  * Rework test suite for newer versions of ASDF
+  * Upload to Debian (closes: 921508)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 29 Sep 2020 15:55:37 +0000
+
 cl-puri (1:1.5.7-1) unstable; urgency=medium
 
   * Avoid name collision with zacl and net.uri nickname (thanks Dave Cooper)

diff --git a/debian/compat b/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..b4de3947675361a7770d29b8982c407b0ec6b2a0 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+11

diff --git a/debian/control b/debian/control
index 5d382cfb8a36a01dfca58d44f1cf2109fd7cbf57..71bca0681e03e747f743f6d40d8fcd24b85de9c0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: lisp
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends-Indep: dh-lisp
-Build-Depends: debhelper (>= 7.0.0)
+Build-Depends: debhelper (>= 11.0.0)
 Standards-Version: 3.9.5.0
 Homepage: http://files.kpe.io/puri/
 Vcs-Git: git://git.kpe.io/puri/

diff --git a/puri.asd b/puri.asd
index 0e4ea9c52f9de44dd7f2b414e2629d4c5eea2800..eda4fafce9b82883e321618bd6125175bfc70b88 100644 (file)
--- a/puri.asd
+++ b/puri.asd
@@ -6,28 +6,20 @@
 (defpackage #:puri-system (:use #:cl #:asdf))
 (in-package #:puri-system)
 
-
 (defsystem puri
   :name "cl-puri"
   :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
   :licence "GNU Lesser General Public License"
   :description "Portable Universal Resource Indentifier Library"
   :components
-  ((:file "src")))
-
-(defmethod perform ((o test-op) (c (eql (find-system 'puri))))
-  (oos 'load-op 'puri-tests)
-  (oos 'test-op 'puri-tests))
+  ((:file "src"))
+  :in-order-to ((test-op (test-op "puri/test"))))
 
-(defsystem puri-tests
-    :depends-on (:puri :ptester) 
+(defsystem puri/test
+    :depends-on (:ptester :puri)
     :components
-    ((:file "tests")))
-
-(defmethod perform ((o test-op) (c (eql (find-system 'puri-tests))))
-  (or (funcall (intern (symbol-name '#:do-tests)
-                      (find-package :puri-tests)))
-      (error "test-op failed")))
-
-(defmethod operation-done-p ((o test-op) (c (eql (find-system 'puri-tests))))
-  (values nil))
+    ((:file "tests"))
+    :perform (test-op (o s)
+                      (or (funcall (intern (symbol-name '#:do-tests)
+                                          (find-package '#:puri/test)))
+                          (error "test-op failed"))))

diff --git a/tests.lisp b/tests.lisp
index 03449227920c8dc5b69973e5a17ea051a3aff4ea..4d77fff230797216df5a8a73c2acd7db8393b4ee 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -23,8 +23,8 @@
 ;; $Id$
 
 
-(defpackage #:puri-tests (:use #:puri #:cl #:ptester))
-(in-package #:puri-tests)
+(defpackage #:puri/test (:use #:puri #:cl #:ptester))
+(in-package #:puri/test)
 
 (unintern-uri t)
 
@@ -427,5 +427,3 @@
     (with-tests (:name "puri")
       (gen-test-forms)))
   t)
-
-