* lib.scm (pass-if, expect-fail): Generalized.

* * tests/eval.test:  Fixed documentation test.

diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 9bcf4fe..c92509b 100644 (file)
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-21  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+       * lib.scm (pass-if, expect-fail):  Generalized to allow a sequence
+       of expressions.
+
+       * tests/eval.test:  Fix documentation test.
+
 2000-06-30  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
        * tests/list.test:  Added tests for list-ref, list-set! and

diff --git a/test-suite/lib.scm b/test-suite/lib.scm
index c69b18b..fa73097 100644 (file)
--- a/test-suite/lib.scm
+++ b/test-suite/lib.scm
@@ -244,12 +244,12 @@
   (set! run-test local-run-test))
 
 ;;; A short form for tests that are expected to pass, taken from Greg.
-(defmacro pass-if (name body)
-  `(run-test ,name #t (lambda () (not (not (begin ,body))))))
+(defmacro pass-if (name body . rest)
+  `(run-test ,name #t (lambda () (not (not (begin ,body ,@rest))))))
 
 ;;; A short form for tests that are expected to fail, taken from Greg.
-(defmacro expect-fail (name body)
-  `(run-test ,name #f (lambda () ,body)))
+(defmacro expect-fail (name body . rest)
+  `(run-test ,name #f (lambda () ,body ,@rest)))
 
 \f
 ;;;; TEST NAMES

diff --git a/test-suite/tests/eval.test b/test-suite/tests/eval.test
index cdc69ef..ba6a4ef 100644 (file)
--- a/test-suite/tests/eval.test
+++ b/test-suite/tests/eval.test
@@ -94,7 +94,7 @@
   ;; Is documentation available?
 
   (expect-fail "documented?"
-    (documented? 'map))
+    (documented? map))
 
   (with-test-prefix "argument error"