XEmacs 21.4.9 "Informed Management".

[chise/xemacs-chise.git.1] / tests / automated / test-harness.el

diff --git a/tests/automated/test-harness.el b/tests/automated/test-harness.el
index 52093f4..e93046f 100644 (file)
--- a/tests/automated/test-harness.el
+++ b/tests/automated/test-harness.el
@@ -99,7 +99,7 @@ The output file's name is made by appending `c' to the end of FILENAME."
          (setq body (cons (read buffer) body)))
       (end-of-file nil)
       (error
-       (princ "Unexpected error %S reading forms from buffer\n" error-info)))
+       (princ (format "Unexpected error %S reading forms from buffer\n" error-info))))
     `(lambda ()
        (defvar passes)
        (defvar assertion-failures)
@@ -236,8 +236,11 @@ The output file's name is made by appending `c' to the end of FILENAME."
       (princ "\nTesting Compiled Lisp\n\n")
       (let (code)
        (condition-case error-info
-           (setq code (let ((byte-compile-warnings nil))
-                        (byte-compile (test-harness-read-from-buffer inbuffer))))
+           (setq code
+                 ;; our lisp code is often intentionally dubious,
+                 ;; so throw away _all_ the byte compiler warnings.
+                 (letf (((symbol-function 'byte-compile-warn) 'ignore))
+                   (byte-compile (test-harness-read-from-buffer inbuffer))))
          (error
           (princ (format "Unexpected error %S while byte-compiling code\n"
                          error-info))))
@@ -273,6 +276,8 @@ The output file's name is made by appending `c' to the end of FILENAME."
        (message "Test suite execution failed unexpectedly."))
       (fmakunbound 'Assert)
       (fmakunbound 'Check-Error)
+      (fmakunbound 'Check-Message)
+      (fmakunbound 'Check-Error-Message)
       (fmakunbound 'Ignore-Ebola)
       (fmakunbound 'Int-to-Marker)
       )))