From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Fri, 20 Sep 2002 07:55:56 +0000 (+0000)
Subject: r2790: *** empty log message ***
X-Git-Url: http://git.kpe.io/?p=ptester.git;a=commitdiff_plain;h=1f88c89d8d2dae56a47efd19ed6d96b5e823d224

r2790: *** empty log message ***
---

diff --git a/debian/changelog b/debian/changelog
index 7e7276d..57678f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-cl-tester (2.2.12.2.6.1-1) unstable; urgency=low
+cl-tester (1.1-1) unstable; urgency=low
 
-  * Initial Release (closes: )
+  * Initial Release (closes: 161614)
 
  -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 20 Sep 2002 01:08:33 -0600
 
diff --git a/debian/cl-tester.doc-base b/debian/cl-tester.doc-base
index 70c402b..5c83ac5 100644
--- a/debian/cl-tester.doc-base
+++ b/debian/cl-tester.doc-base
@@ -6,5 +6,5 @@ Abstract: This manual describes the
 Section: programming
 
 Format: HTML
-Index: /usr/share/doc/cl-tester/html/tester.html
-Files: /usr/share/doc/cl-tester/html/*.html
+Index: /usr/share/doc/cl-tester/tester.html
+Files: /usr/share/doc/cl-tester/*.html
diff --git a/debian/copyright b/debian/copyright
index 9965857..b306d03 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,9 @@ Upstream Author(s): Kevin Layer, Franz Inc.
 Changes compared to upstream: 
   - Added .asd file for use with Common Lisp Controller
   - Defined condition SIMPLE-BREAK and BREAK for CMU
-  - Include if* source in the tester.cl file
+  - Include if* source in the tester.cl file, remove dependency on excl package
+  - Modify WITH-TEST so it does not depend on (sys:gsgc-switch :print) form
+
 
 Copyright:
 
diff --git a/tester.cl b/tester.cl
index ebdca71..9218eac 100644
--- a/tester.cl
+++ b/tester.cl
@@ -26,10 +26,10 @@
 ;;;; from the original ACL 6.1 sources:
 ;; Id: tester.cl,v 2.2.12.1 2001/06/05 18:45:10 layer Exp
 
-;; $Id: tester.cl,v 1.1 2002/09/20 07:34:06 kevin Exp $
+;; $Id: tester.cl,v 1.2 2002/09/20 07:55:56 kevin Exp $
 
 (defpackage :util.test
-  (:use :common-lisp :excl)
+  (:use :common-lisp)
   (:shadow #:test)
   (:export
 ;;;; Control variables:
@@ -64,7 +64,8 @@
 ;; This is in the public domain... please feel free to put this definition
 ;; in your code or distribute it with your version of lisp.
 
-(defvar if*-keyword-list '("then" "thenret" "else" "elseif"))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defvar if*-keyword-list '("then" "thenret" "else" "elseif")))
 
 (defmacro if* (&rest args)
    (do ((xx (reverse args) (cdr xx))
@@ -555,6 +556,7 @@ Reason: the format-arguments were incorrect.~%")
 		      "~
 ~&Test ~a aborted by signalling an uncaught error:~%~a~%"
 		      ,g-name c))))
+	 #+allegro
 	 (let ((state (sys:gsgc-switch :print)))
 	   (setf (sys:gsgc-switch :print) nil)
 	   (format t "~&**********************************~%" ,g-name)
@@ -563,6 +565,14 @@ Reason: the format-arguments were incorrect.~%")
 	   (unless (zerop *test-unexpected-failures*)
 	     (format t "UNEXPECTED: ~s" *test-unexpected-failures*))
 	   (format t "~%Successes this test:~s~%" *test-successes*)
-	   (setf (sys:gsgc-switch :print) state))))))
+	   (setf (sys:gsgc-switch :print) state))
+	 #-allegro
+	 (progn
+	   (format t "~&**********************************~%" ,g-name)
+	   (format t "End ~a test~%" ,g-name)
+	   (format t "Errors detected in this test: ~s " *test-errors*)
+	   (unless (zerop *test-unexpected-failures*)
+	     (format t "UNEXPECTED: ~s" *test-unexpected-failures*))
+	   (format t "~%Successes this test:~s~%" *test-successes*))))))
 
 (provide :tester #+module-versions 1.1)