Use newer ASDF test-op symantics

diff --git a/hyperobject-tests.asd b/hyperobject-tests.asd
deleted file mode 100644 (file)
index 054db1b..0000000
--- a/hyperobject-tests.asd
+++ /dev/null
@@ -1,24 +0,0 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          hyperobject-tests.asd
-;;;; Purpose:       ASDF system definitionf for hyperobject testing package
-;;;; Author:        Kevin M. Rosenberg
-;;;; Date Started:  Apr 2003
-;;;;
-;;;; $Id$
-;;;; *************************************************************************
-
-(defpackage #:hyperobject-tests-system
-  (:use #:asdf #:cl))
-(in-package #:hyperobject-tests-system)
-
-(defsystem hyperobject-tests
-    :depends-on (:rt :hyperobject)
-    :components ((:file "tests")))
-
-(defmethod perform ((o test-op) (c (eql (find-system :hyperobject-tests))))
-  (or (funcall (intern (symbol-name '#:do-tests)
-                      (find-package '#:regression-test)))
-      (error "test-op failed")))

diff --git a/hyperobject.asd b/hyperobject.asd
index 7848baf57a4ec45f396f20e79ab2b0741a73c101..f5f7916d4058264cc12b3adf10735b45a1c3fb84 100644 (file)
--- a/hyperobject.asd
+++ b/hyperobject.asd
@@ -16,10 +16,10 @@
 (defsystem hyperobject
   :name "hyperobject"
   :author "Kevin M. Rosenberg <kevin@rosenberg.net>"
-  :version "2.7.x"
+  :version "2.7.2"
   :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
   :licence "BSD-like License"
-
+  :depends-on (:kmrcl :clsql)
   :components
   ((:file "package")
    (:file "metaclass" :depends-on ("package"))
@@ -30,8 +30,12 @@
    (:file "views" :depends-on ("mop"))
    (:file "base-class" :depends-on ("views" "sql" "rules"))
    )
-  :depends-on (:kmrcl :clsql))
+  :in-order-to ((test-op (test-op "hyperobject/test"))))
 
-(defmethod perform ((o test-op) (c (eql (find-system :hyperobject))))
-  (operate 'load-op 'hyperobject-tests)
-  (operate 'test-op 'hyperobject-tests :force t))
+(defsystem hyperobject/test
+    :depends-on (:rt :hyperobject)
+    :components ((:file "tests"))
+    :perform (test-op (o s)
+                      (or (funcall (intern (symbol-name '#:do-tests)
+                                           (find-package '#:regression-test)))
+                          (error "test-op failed"))))