From 963ec39d803b79bc1156bbf3ad7828ba30f873e4 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Tue, 25 Aug 2020 13:35:51 -0600
Subject: [PATCH] Use newer ASDF test-op functionality

---
 kmrcl-tests.asd | 27 ---------------------------
 kmrcl.asd       | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 kmrcl-tests.asd

diff --git a/kmrcl-tests.asd b/kmrcl-tests.asd
deleted file mode 100644
index 331ee74..0000000
--- a/kmrcl-tests.asd
+++ /dev/null
@@ -1,27 +0,0 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          kmrcl-tests.asd
-;;;; Purpose:       ASDF system definitionf for kmrcl testing package
-;;;; Author:        Kevin M. Rosenberg
-;;;; Date Started:  Apr 2003
-;;;;
-;;;; $Id$
-;;;; *************************************************************************
-
-(defpackage #:kmrcl-tests-system
-  (:use #:asdf #:cl))
-(in-package #:kmrcl-tests-system)
-
-(defsystem kmrcl-tests
-    :depends-on (:rt :kmrcl)
-    :components
-    ((:file "tests")))
-
-(defmethod perform ((o test-op) (c (eql (find-system 'kmrcl-tests))))
-  (or (funcall (intern (symbol-name '#:do-tests)
-		       (find-package '#:regression-test)))
-      (error "test-op failed")
-      t))
-
diff --git a/kmrcl.asd b/kmrcl.asd
index e53ba6a..0150ed6 100644
--- a/kmrcl.asd
+++ b/kmrcl.asd
@@ -58,10 +58,15 @@
      (:file "os" :depends-on ("macros" "impl"))
      (:file "signals" :depends-on ("package"))
      (:file "btree" :depends-on ("macros"))
-     (:file "hash" :depends-on ("macros"))
-     ))
+     (:file "hash" :depends-on ("macros")))
+    :in-order-to ((test-op (test-op "kmrcl/test"))))
 
-(defmethod perform ((o test-op) (c (eql (find-system 'kmrcl))))
-  (operate 'load-op 'kmrcl-tests)
-  (operate 'test-op 'kmrcl-tests :force t))
 
+(defsystem kmrcl/test
+    :depends-on (:rt :kmrcl)
+    :components
+    ((:file "tests"))
+    :perform (test-op (o s)
+                      (or (funcall (intern (symbol-name '#:do-tests)
+		                           (find-package '#:regression-test)))
+                          (error "test-op failed"))))
-- 
2.34.1