aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testiere.lisp6
-rw-r--r--testiere.asd3
2 files changed, 4 insertions, 5 deletions
diff --git a/src/testiere.lisp b/src/testiere.lisp
index 5b90ec8..451d886 100644
--- a/src/testiere.lisp
+++ b/src/testiere.lisp
@@ -238,14 +238,14 @@ restarts to try when tests fail."
(setf (fdefinition ',name) ',orig-generic))))))
(defun on ()
- (unless (member :testiere *features*)
- (pushnew :testiere *features*)
+ (pushnew :testiere *features*)
+ (unless (eq *macroexpand-hook* 'testiere-hook)
(setf
*cached-macroexpand-hook* *macroexpand-hook*
*macroexpand-hook* 'testiere-hook )))
(defun off ()
- (when (member :testiere *features*)
+ (when (eq *macroexpand-hook* 'testiere-hook)
(setf *features* (delete :testiere *features*))
(setf *macroexpand-hook* *cached-macroexpand-hook*
*cached-macroexpand-hook* nil)))
diff --git a/testiere.asd b/testiere.asd
index c69c0bf..3703823 100644
--- a/testiere.asd
+++ b/testiere.asd
@@ -10,5 +10,4 @@
:serial t
:components ((:file "package")
(:file "testiere")
- (:file "standard-hooks")
- (:file "config")))
+ (:file "standard-hooks")))