r2790: *** empty log message ***

diff --git a/debian/changelog b/debian/changelog
index 7e7276d9c5c5d5f5e0d0aecb3c46bb42aad6a945..57678f2120bdda1c7b90d34d60ac5755f30c1463 100644 (file)
--- 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
 
 
  -- 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 70c402b403ec2a18186300c1c7c31c8f7ec549a3..5c83ac5bf78f43934cab93301827bf74ff587a65 100644 (file)
--- 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
 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 9965857d73061ee8daaf42c21849c7942d638f27..b306d0310f88a0e6713d763ec9d60c6f5a717853 100644 (file)
--- 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
 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:
 
 
 Copyright:
 

diff --git a/tester.cl b/tester.cl
index ebdca7131b20d1b7a761f772ff487c11e67e0596..9218eac2ba7a070a240cb1321c7b02b5a3325343 100644 (file)
--- 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
 
 ;;;; 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
 
 (defpackage :util.test

-  (:use :common-lisp :excl)
+  (:use :common-lisp)

   (:shadow #:test)
   (:export
 ;;;; Control variables:
   (: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.
 
 ;; 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))
 
 (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))))
                      "~
 ~&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)
         (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*)
           (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)
 
 (provide :tester #+module-versions 1.1)