--- a/etc/ChangeLog	Mon Feb 22 21:26:18 2010 -0600
+++ b/etc/ChangeLog	Mon Feb 22 22:04:55 2010 -0600
@@ -1,3 +1,8 @@
+2010-02-22  Ben Wing  <ben@xemacs.org>
+
+	* dbxrc.in:
+	test-harness.el is in lisp directory now.
+
 2010-01-28  Jerry James  <james@xemacs.org>
 
 	* tests/external-widget/Makefile: Add copyright and license

--- a/etc/dbxrc.in	Mon Feb 22 21:26:18 2010 -0600
+++ b/etc/dbxrc.in	Mon Feb 22 22:04:55 2010 -0600
@@ -4,6 +4,7 @@
 ## The generated file depends on src/config.h (currently only in one place).
 
 ## Copyright (C) 1998 Free Software Foundation, Inc.
+## Copyright (C) 2010 Ben Wing.
 
 ## This file is part of XEmacs.
 
@@ -194,7 +195,7 @@
 end
 
 function check-xemacs {
-  run -batch -l ../tests/automated/test-harness.el -f batch-test-emacs ../tests/automated
+  run -batch -l test-harness -f batch-test-emacs ../tests/automated
 }
 
 document check-temacs << 'end'
@@ -205,7 +206,7 @@
 end
 
 function check-temacs {
-  run-temacs -q -batch -l ../tests/automated/test-harness.el -f batch-test-emacs ../tests/automated
+  run-temacs -q -batch -l test-harness -f batch-test-emacs ../tests/automated
 }
 
 document update-elc << 'end'

--- a/lisp/ChangeLog	Mon Feb 22 21:26:18 2010 -0600
+++ b/lisp/ChangeLog	Mon Feb 22 22:04:55 2010 -0600
@@ -1,3 +1,19 @@
+2010-02-22  Ben Wing  <ben@xemacs.org>
+
+	* test-harness.el:
+	* test-harness.el (test-harness-from-buffer):
+	* test-harness.el (batch-test-emacs):
+	Move file from tests/automated into lisp/ so it gets
+	byte-compiled.  This significantly reduces the amount of extra
+	crap in outputted backtraces.  Delete hack in batch-test-emacs to
+	look for test-harness.el in the test directory since it's not there
+	any more.
+
+	Also, in `Check-Message', incorporate call to `Skip-Test-Unless'
+	in the macro output rather than its body, to avoid problems byte-
+	compiling the file -- `Skip-Test-Unless' isn't available in the
+	environment during byte-compilation so we can't call it then.
+	
 2010-02-22  Ben Wing  <ben@xemacs.org>
 
 	* mule/make-coding-system.el:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/test-harness.el	Mon Feb 22 22:04:55 2010 -0600
@@ -0,0 +1,835 @@
+;; test-harness.el --- Run Emacs Lisp test suites.
+
+;;; Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
+;;; Copyright (C) 2002, 2010 Ben Wing.
+
+;; Author: Martin Buchholz
+;; Maintainer: Stephen J. Turnbull <stephen@xemacs.org>
+;; Keywords: testing
+
+;; This file is part of XEmacs.
+
+;; XEmacs is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Synched up with: Not in FSF.
+
+;;; Commentary:
+
+;;; A test suite harness for testing XEmacs.
+;;; The actual tests are in other files in this directory.
+;;; Basically you just create files of emacs-lisp, and use the
+;;; Assert, Check-Error, Check-Message, and Check-Error-Message functions
+;;; to create tests.  See `test-harness-from-buffer' below.
+;;; Don't suppress tests just because they're due to known bugs not yet
+;;; fixed -- use the Known-Bug-Expect-Failure and
+;;; Implementation-Incomplete-Expect-Failure wrapper macros to mark them.
+;;; A lot of the tests we run push limits; suppress Ebola message with the
+;;; Ignore-Ebola wrapper macro.
+;;; Some noisy code will call `message'.  Output from `message' can be
+;;; suppressed with the Silence-Message macro.  Functions that are known to
+;;; issue messages include `write-region', `find-tag', `tag-loop-continue',
+;;; `insert', and `mark-whole-buffer'.  N.B. The Silence-Message macro
+;;; currently does not suppress the newlines printed by `message'.
+;;; Definitely do not use Silence-Message with Check-Message.
+;;; In general it should probably only be used on code that prepares for a
+;;; test, not on tests.
+;;; 
+;;; You run the tests using M-x test-emacs-test-file,
+;;; or $(EMACS) -batch -l test-harness -f batch-test-emacs file ...
+;;; which is run for you by the `make check' target in the top-level Makefile.
+
+(require 'bytecomp)
+
+(defvar unexpected-test-suite-failures 0
+  "Cumulative number of unexpected failures since test-harness was loaded.
+
+\"Unexpected failures\" are those caught by a generic handler established
+outside of the test context.  As such they involve an abort of the test
+suite for the file being tested.
+
+They often occur during preparation of a test or recording of the results.
+For example, an executable used to generate test data might not be present
+on the system, or a system error might occur while reading a data file.")
+
+(defvar unexpected-test-suite-failure-files nil
+  "List of test files causing unexpected failures.")
+
+;; Declared for dynamic scope; _do not_ initialize here.
+(defvar unexpected-test-file-failures)
+
+(defvar test-harness-bug-expected nil
+  "Non-nil means a bug is expected; backtracing/debugging should not happen.")
+
+(defvar test-harness-test-compiled nil
+  "Non-nil means the test code was compiled before execution.
+
+You probably should not make tests depend on compilation.
+However, it can be useful to conditionally change messages based on whether
+the code was compiled or not.  For example, the case that motivated the
+implementation of this variable:
+
+\(when test-harness-test-compiled
+  ;; this ha-a-ack depends on the failing compiled test coming last
+  \(setq test-harness-failure-tag
+	\"KNOWN BUG - fix reverted; after 2003-10-31 notify stephen\n\"))")
+
+(defvar test-harness-verbose
+  (and (not noninteractive) (> (device-baud-rate) search-slow-speed))
+  "*Non-nil means print messages describing progress of emacs-tester.")
+
+(defvar test-harness-unexpected-error-enter-debugger debug-on-error
+  "*Non-nil means enter debugger when an unexpected error occurs.
+Only applies interactively.  Normally true if `debug-on-error' has been set.
+See also `test-harness-assertion-failure-enter-debugger' and
+`test-harness-unexpected-error-show-backtrace'.")
+
+(defvar test-harness-assertion-failure-enter-debugger debug-on-error
+  "*Non-nil means enter debugger when an assertion failure occurs.
+Only applies interactively.  Normally true if `debug-on-error' has been set.
+See also `test-harness-unexpected-error-enter-debugger' and
+`test-harness-assertion-failure-show-backtrace'.")
+
+(defvar test-harness-unexpected-error-show-backtrace t
+  "*Non-nil means show backtrace upon unexpected error.
+Only applies when debugger is not entered.  Normally true by default.  See also
+`test-harness-unexpected-error-enter-debugger' and
+`test-harness-assertion-failure-show-backtrace'.")
+
+(defvar test-harness-assertion-failure-show-backtrace stack-trace-on-error
+  "*Non-nil means show backtrace upon assertion failure.
+Only applies when debugger is not entered.  Normally true if
+`stack-trace-on-error' has been set.  See also
+`test-harness-assertion-failure-enter-debugger' and
+`test-harness-unexpected-error-show-backtrace'.")
+
+(defvar test-harness-file-results-alist nil
+  "Each element is a list (FILE SUCCESSES TESTS).
+The order is the reverse of the order in which tests are run.
+
+FILE is a string naming the test file.
+SUCCESSES is a non-negative integer, the number of successes.
+TESTS is a non-negative integer, the number of tests run.")
+
+(defvar test-harness-risk-infloops nil
+  "*Non-nil to run tests that may loop infinitely in buggy implementations.")
+
+(defvar test-harness-current-file nil)
+
+(defvar emacs-lisp-file-regexp (purecopy "\\.el\\'")
+  "*Regexp which matches Emacs Lisp source files.")
+
+(defconst test-harness-file-summary-template
+  (format "%%-%ds %%%dd of %%%dd tests successful (%%3d%%%%)."
+	  (length "byte-compiler-tests.el:") ; use the longest file name
+	  5
+	  5)
+  "Format for summary lines printed after each file is run.")
+
+(defconst test-harness-null-summary-template
+  (format "%%-%ds             No tests run."
+	  (length "byte-compiler-tests.el:")) ; use the longest file name
+  "Format for \"No tests\" lines printed after a file is run.")
+
+(defconst test-harness-aborted-summary-template
+  (format "%%-%ds          %%%dd tests completed (aborted)."
+	  (length "byte-compiler-tests.el:") ; use the longest file name
+	  5)
+  "Format for summary lines printed after a test run on a file was aborted.")
+
+;;;###autoload
+(defun test-emacs-test-file (filename)
+  "Test a file of Lisp code named FILENAME.
+The output file's name is made by appending `c' to the end of FILENAME."
+  (interactive
+   (let ((file buffer-file-name)
+	 (file-name nil)
+	 (file-dir nil))
+     (and file
+	  (eq (cdr (assq 'major-mode (buffer-local-variables)))
+	      'emacs-lisp-mode)
+	  (setq file-name (file-name-nondirectory file)
+		file-dir (file-name-directory file)))
+     (list (read-file-name "Test file: " file-dir nil nil file-name))))
+  ;; Expand now so we get the current buffer's defaults
+  (setq filename (expand-file-name filename))
+
+  ;; If we're testing a file that's in a buffer and is modified, offer
+  ;; to save it first.
+  (or noninteractive
+      (let ((b (get-file-buffer (expand-file-name filename))))
+	(if (and b (buffer-modified-p b)
+		 (y-or-n-p (format "save buffer %s first? " (buffer-name b))))
+	    (save-excursion (set-buffer b) (save-buffer)))))
+
+  (if (or noninteractive test-harness-verbose)
+      (message "Testing %s..." filename))
+  (let ((test-harness-current-file filename)
+	input-buffer)
+    (save-excursion
+      (setq input-buffer (get-buffer-create " *Test Input*"))
+      (set-buffer input-buffer)
+      (erase-buffer)
+      (insert-file-contents filename)
+      ;; Run hooks including the uncompression hook.
+      ;; If they change the file name, then change it for the output also.
+      (let ((buffer-file-name filename)
+	    (default-major-mode 'emacs-lisp-mode)
+	    (enable-local-eval nil))
+        (normal-mode)
+        (setq filename buffer-file-name)))
+    (test-harness-from-buffer input-buffer filename)
+    (kill-buffer input-buffer)
+    ))
+
+(defsubst test-harness-assertion-failure-do-debug (error-info)
+  "Maybe enter debugger or display a backtrace on assertion failure.
+ERROR-INFO is a cons of the args (SIG . DATA) that were passed to `signal'.
+The debugger will be entered if noninteractive and
+`test-harness-unexpected-error-enter-debugger' is non-nil; else, a
+backtrace will be displayed if `test-harness-unexpected-error-show-backtrace'
+is non-nil."
+  (when (not test-harness-bug-expected)
+    (cond ((and (not noninteractive)
+		test-harness-assertion-failure-enter-debugger)
+	   (funcall debugger 'error error-info))
+	  (test-harness-assertion-failure-show-backtrace
+	   (backtrace nil t)))))
+
+(defsubst test-harness-unexpected-error-do-debug (error-info)
+  "Maybe enter debugger or display a backtrace on unexpected error.
+ERROR-INFO is a cons of the args (SIG . DATA) that were passed to `signal'.
+The debugger will be entered if noninteractive and
+`test-harness-unexpected-error-enter-debugger' is non-nil; else, a
+backtrace will be displayed if `test-harness-unexpected-error-show-backtrace'
+is non-nil."
+  (when (not test-harness-bug-expected)
+    (cond ((and (not noninteractive)
+		test-harness-unexpected-error-enter-debugger)
+	   (funcall debugger 'error error-info))
+	  (test-harness-unexpected-error-show-backtrace
+	   (backtrace nil t)))))
+
+(defsubst test-harness-unexpected-error-condition-handler (error-info context-msg)
+  "Condition handler for when unexpected errors occur.
+Useful in conjunction with `call-with-condition-handler'.  ERROR-INFO is the
+value passed to the condition handler.  CONTEXT-MSG is a string indicating
+the context in which the unexpected error occurred.  A message is outputted
+including CONTEXT-MSG in it, `unexpected-test-file-failures' is incremented,
+and `test-harness-unexpected-error-do-debug' is called, which may enter the
+debugger or output a backtrace, depending on the settings of
+`test-harness-unexpected-error-enter-debugger' and
+`test-harness-unexpected-error-show-backtrace'.
+
+The function returns normally, which causes error-handling processing to
+continue; if you want to catch the error, you also need to wrap everything
+in `condition-case'.  See also `test-harness-error-wrap', which does this
+wrapping."
+  (incf unexpected-test-file-failures)
+  (princ (format "Unexpected error %S while %s\n"
+		 error-info context-msg))
+  (message "Unexpected error %S while %s." error-info context-msg)
+  (test-harness-unexpected-error-do-debug error-info))
+
+(defmacro test-harness-error-wrap (context-msg abort-msg &rest body)
+  "Wrap BODY so that unexpected errors are caught.
+The debugger will be entered if noninteractive and
+`test-harness-unexpected-error-enter-debugger' is non-nil; else, a backtrace
+will be displayed if `test-harness-unexpected-error-show-backtrace' is
+non-nil.  CONTEXT-MSG is displayed as part of a message shown before entering
+the debugger or showing a backtrace, and ABORT-MSG, if non-nil, is displayed
+afterwards.  See "
+  `(condition-case nil
+    (call-with-condition-handler
+	#'(lambda (error-info)
+	    (test-harness-unexpected-error-condition-handler
+	     error-info ,context-msg))
+	#'(lambda ()
+	    ,@body))
+    (error ,(if abort-msg `(message ,abort-msg) nil))))
+
+(defun test-harness-read-from-buffer (buffer)
+  "Read forms from BUFFER, and turn it into a lambda test form."
+  (let ((body nil))
+    (goto-char (point-min) buffer)
+    (condition-case nil
+	(call-with-condition-handler
+	    #'(lambda (error-info)
+		;; end-of-file is expected, so don't output error or backtrace
+		;; or enter debugger in this case.
+		(unless (eq 'end-of-file (car error-info))
+		  (test-harness-unexpected-error-condition-handler
+		   error-info "reading forms from buffer")))
+	    #'(lambda ()
+		(while t
+		  (setq body (cons (read buffer) body)))))
+      (error nil))
+    `(lambda ()
+       (defvar passes)
+       (defvar assertion-failures)
+       (defvar no-error-failures)
+       (defvar wrong-error-failures)
+       (defvar missing-message-failures)
+       (defvar other-failures)
+
+       (defvar trick-optimizer)
+
+       ,@(nreverse body))))
+
+(defun test-harness-from-buffer (inbuffer filename)
+  "Run tests in buffer INBUFFER, visiting FILENAME."
+  (defvar trick-optimizer)
+  (let ((passes 0)
+	(assertion-failures 0)
+	(no-error-failures 0)
+	(wrong-error-failures 0)
+	(missing-message-failures 0)
+	(other-failures 0)
+	(unexpected-test-file-failures 0)
+
+	;; #### perhaps this should be a defvar, and output at the very end
+	;; OTOH, this way AC types can use a null EMACSPACKAGEPATH to find
+	;; what stuff is needed, and ways to avoid using them
+	(skipped-test-reasons (make-hash-table :test 'equal))
+
+	(trick-optimizer nil)
+	(debug-on-error t)
+	)
+    (with-output-to-temp-buffer "*Test-Log*"
+      (princ (format "Testing %s...\n\n" filename))
+
+      (defconst test-harness-failure-tag "FAIL")
+      (defconst test-harness-success-tag "PASS")
+
+;;;;; BEGIN DEFINITION OF MACROS USEFUL IN TEST CODE
+
+      (defmacro Known-Bug-Expect-Failure (&rest body)
+	"Wrap a BODY that consists of tests that are known to fail.
+This causes messages to be printed on failure indicating that this is expected,
+and on success indicating that this is unexpected."
+	`(let ((test-harness-bug-expected t)
+	       (test-harness-failure-tag "KNOWN BUG")
+	       (test-harness-success-tag "PASS (FAILURE EXPECTED)"))
+	  ,@body))
+
+      (defmacro Known-Bug-Expect-Error (expected-error &rest body)
+	"Wrap a BODY that consists of tests that are known to trigger an error.
+This causes messages to be printed on failure indicating that this is expected,
+and on success indicating that this is unexpected."
+	(let ((quoted-body (if (= 1 (length body))
+			       `(quote ,(car body)) `(quote (progn ,@body)))))
+          `(let ((test-harness-bug-expected t)
+		 (test-harness-failure-tag "KNOWN BUG")
+                 (test-harness-success-tag "PASS (FAILURE EXPECTED)"))
+            (condition-case error-info
+                (progn
+                  (setq trick-optimizer (progn ,@body))
+                  (Print-Pass 
+                   "%S executed successfully, but expected error %S"
+                   ,quoted-body
+                   ',expected-error)
+                  (incf passes))
+              (,expected-error
+               (Print-Failure "%S ==> error %S, as expected"
+                              ,quoted-body ',expected-error)
+               (incf no-error-failures))
+              (error
+               (Print-Failure "%S ==> expected error %S, got error %S instead"
+                              ,quoted-body ',expected-error error-info)
+               (incf wrong-error-failures))))))
+
+      (defmacro Implementation-Incomplete-Expect-Failure (&rest body)
+	"Wrap a BODY containing tests that are known to fail due to incomplete code.
+This causes messages to be printed on failure indicating that the
+implementation is incomplete (and hence the failure is expected); and on
+success indicating that this is unexpected."
+	`(let ((test-harness-bug-expected t)
+	       (test-harness-failure-tag "IMPLEMENTATION INCOMPLETE")
+	       (test-harness-success-tag "PASS (FAILURE EXPECTED)"))
+	  ,@body))
+    
+      (defun Print-Failure (fmt &rest args)
+	(setq fmt (format "%s: %s" test-harness-failure-tag fmt))
+	(if (noninteractive) (apply #'message fmt args))
+	(princ (concat (apply #'format fmt args) "\n")))
+
+      (defun Print-Pass (fmt &rest args)
+	(setq fmt (format "%s: %s" test-harness-success-tag fmt))
+	(and test-harness-verbose
+	     (princ (concat (apply #'format fmt args) "\n"))))
+
+      (defun Print-Skip (test reason &optional fmt &rest args)
+	(setq fmt (concat "SKIP: %S BECAUSE %S" fmt))
+	(princ (concat (apply #'format fmt test reason args) "\n")))
+
+      (defmacro Skip-Test-Unless (condition reason description &rest body)
+	"Unless CONDITION is satisfied, skip test BODY.
+REASON is a description of the condition failure, and must be unique (it
+is used as a hash key).  DESCRIPTION describes the tests that were skipped.
+BODY is a sequence of expressions and may contain several tests."
+	`(if (not ,condition)
+	     (let ((count (gethash ,reason skipped-test-reasons)))
+	       (puthash ,reason (if (null count) 1 (1+ count))
+			skipped-test-reasons)
+	       (Print-Skip ,description ,reason))
+	   ,@body))
+
+      (defmacro Assert (assertion &optional failing-case description)
+	"Test passes if ASSERTION is true.
+Optional FAILING-CASE describes the particular failure.  Optional
+DESCRIPTION describes the assertion; by default, the unevalated assertion
+expression is given.  FAILING-CASE and DESCRIPTION are useful when Assert
+is used in a loop."
+	(let ((description
+	       (or description `(quote ,assertion))))
+	  `(condition-case nil
+	    (call-with-condition-handler
+		#'(lambda (error-info)
+		    (if (eq 'cl-assertion-failed (car error-info))
+			(progn
+			  (Print-Failure
+			   (if ,failing-case
+			       "Assertion failed: %S; failing case = %S"
+			     "Assertion failed: %S")
+			   ,description ,failing-case)
+			  (incf assertion-failures)
+			  (test-harness-assertion-failure-do-debug error-info))
+		      (Print-Failure
+		       (if ,failing-case
+			   "%S ==> error: %S; failing case =  %S"
+			 "%S ==> error: %S")
+		       ,description error-info ,failing-case)
+		      (incf other-failures)
+		      (test-harness-unexpected-error-do-debug error-info)))
+		#'(lambda ()
+		    (assert ,assertion)
+		    (Print-Pass "%S" ,description)
+		    (incf passes)))
+	    (cl-assertion-failed nil))))
+
+;;;;; BEGIN DEFINITION OF SPECIFIC KINDS OF ASSERT MACROS
+
+      (defmacro Assert-test (test testval expected &optional failing-case
+			     description)
+	"Test passes if TESTVAL compares correctly to EXPECTED using TEST.
+TEST should be a two-argument predicate (i.e. a function of two arguments
+that returns t or nil), such as `eq', `eql', `equal', `equalp', `=', `<=',
+'>', 'file-newer-than-file-p' etc.  Optional FAILING-CASE describes the
+particular failure; any value given here will be concatenated with a phrase
+describing the expected and actual values of the comparison.  Optional
+DESCRIPTION describes the assertion; by default, the unevalated comparison
+expressions are given.  FAILING-CASE and DESCRIPTION are useful when Assert
+is used in a loop."
+	(let* ((assertion `(,test ,testval ,expected))
+	       (failmsg `(format "%S should be `%s' to %S but isn't"
+			  ,testval ',test ,expected))
+	       (failmsg2 (if failing-case `(concat 
+					   (format "%S, " ,failing-case)
+					   ,failmsg)
+			  failmsg)))
+	  `(Assert ,assertion ,failmsg2 ,description)))
+
+      (defmacro Assert-test-not (test testval expected &optional failing-case
+				 description)
+	"Test passes if TESTVAL does not compare correctly to EXPECTED using TEST.
+TEST should be a two-argument predicate (i.e. a function of two arguments
+that returns t or nil), such as `eq', `eql', `equal', `equalp', `=', `<=',
+'>', 'file-newer-than-file-p' etc.  Optional FAILING-CASE describes the
+particular failure; any value given here will be concatenated with a phrase
+describing the expected and actual values of the comparison.  Optional
+DESCRIPTION describes the assertion; by default, the unevalated comparison
+expressions are given.  FAILING-CASE and DESCRIPTION are useful when Assert
+is used in a loop."
+	(let* ((assertion `(not (,test ,testval ,expected)))
+	       (failmsg `(format "%S shouldn't be `%s' to %S but is"
+			  ,testval ',test ,expected))
+	       (failmsg2 (if failing-case `(concat 
+					   (format "%S, " ,failing-case)
+					   ,failmsg)
+			  failmsg)))
+	  `(Assert ,assertion ,failmsg2 ,description)))
+
+      ;; Specific versions of `Assert-test'.  These are just convenience
+      ;; functions, functioning identically to `Assert-test', and duplicating
+      ;; the doc string for each would be too annoying.
+      (defmacro Assert-eq (testval expected &optional failing-case
+			   description)
+	`(Assert-test eq ,testval ,expected ,failing-case ,description))
+      (defmacro Assert-eql (testval expected &optional failing-case
+			    description)
+	`(Assert-test eql ,testval ,expected ,failing-case ,description))
+      (defmacro Assert-equal (testval expected &optional failing-case
+			      description)
+	`(Assert-test equal ,testval ,expected ,failing-case ,description))
+      (defmacro Assert-equalp (testval expected &optional failing-case
+			      description)
+	`(Assert-test equalp ,testval ,expected ,failing-case ,description))
+      (defmacro Assert-string= (testval expected &optional failing-case
+			      description)
+	`(Assert-test string= ,testval ,expected ,failing-case ,description))
+      (defmacro Assert= (testval expected &optional failing-case
+			 description)
+	`(Assert-test = ,testval ,expected ,failing-case ,description))
+      (defmacro Assert<= (testval expected &optional failing-case
+			  description)
+	`(Assert-test <= ,testval ,expected ,failing-case ,description))
+
+      ;; Specific versions of `Assert-test-not'.  These are just convenience
+      ;; functions, functioning identically to `Assert-test-not', and
+      ;; duplicating the doc string for each would be too annoying.
+      (defmacro Assert-not-eq (testval expected &optional failing-case
+			       description)
+	`(Assert-test-not eq ,testval ,expected ,failing-case ,description))
+      (defmacro Assert-not-eql (testval expected &optional failing-case
+				description)
+	`(Assert-test-not eql ,testval ,expected ,failing-case ,description))
+      (defmacro Assert-not-equal (testval expected &optional failing-case
+				  description)
+	`(Assert-test-not equal ,testval ,expected ,failing-case ,description))
+      (defmacro Assert-not-equalp (testval expected &optional failing-case
+				   description)
+	`(Assert-test-not equalp ,testval ,expected ,failing-case ,description))
+      (defmacro Assert-not-string= (testval expected &optional failing-case
+				    description)
+	`(Assert-test-not string= ,testval ,expected ,failing-case ,description))
+      (defmacro Assert-not= (testval expected &optional failing-case
+			     description)
+	`(Assert-test-not = ,testval ,expected ,failing-case ,description))
+
+      (defmacro Check-Error (expected-error &rest body)
+	(let ((quoted-body (if (= 1 (length body))
+			       `(quote ,(car body)) `(quote (progn ,@body)))))
+	  `(condition-case error-info
+	       (progn
+		 (setq trick-optimizer (progn ,@body))
+		 (Print-Failure "%S executed successfully, but expected error %S"
+				,quoted-body
+				',expected-error)
+		 (incf no-error-failures))
+	     (,expected-error
+	      (Print-Pass "%S ==> error %S, as expected"
+			  ,quoted-body ',expected-error)
+	      (incf passes))
+	     (error
+	      (Print-Failure "%S ==> expected error %S, got error %S instead"
+			     ,quoted-body ',expected-error error-info)
+	      (incf wrong-error-failures)))))
+
+      (defmacro Check-Error-Message (expected-error expected-error-regexp
+						    &rest body)
+	(let ((quoted-body (if (= 1 (length body))
+			       `(quote ,(car body)) `(quote (progn ,@body)))))
+	  `(condition-case error-info
+	       (progn
+		 (setq trick-optimizer (progn ,@body))
+		 (Print-Failure "%S executed successfully, but expected error %S"
+				,quoted-body ',expected-error)
+		 (incf no-error-failures))
+	     (,expected-error
+	      ;; #### Damn, this binding doesn't capture frobs, eg, for
+	      ;; invalid_argument() ... you only get the REASON.  And for
+	      ;; wrong_type_argument(), there's no reason only FROBs.
+	      ;; If this gets fixed, fix tests in regexp-tests.el.
+	      (let ((error-message (second error-info)))
+		(if (string-match ,expected-error-regexp error-message)
+		    (progn
+		      (Print-Pass "%S ==> error %S %S, as expected"
+				  ,quoted-body error-message ',expected-error)
+		      (incf passes))
+		  (Print-Failure "%S ==> got error %S as expected, but error message %S did not match regexp %S"
+				 ,quoted-body ',expected-error error-message ,expected-error-regexp)
+		  (incf wrong-error-failures))))
+	     (error
+	      (Print-Failure "%S ==> expected error %S, got error %S instead"
+			     ,quoted-body ',expected-error error-info)
+	      (incf wrong-error-failures)))))
+
+      ;; Do not use this with Silence-Message.
+      (defmacro Check-Message (expected-message-regexp &rest body)
+	(let ((quoted-body (if (= 1 (length body))
+			       `(quote ,(car body))
+			     `(quote (progn ,@body)))))
+	  `(Skip-Test-Unless (fboundp 'defadvice) "can't defadvice"
+	    expected-message-regexp
+	    (let ((messages ""))
+	      (defadvice message (around collect activate)
+		(defvar messages)
+		(let ((msg-string (apply 'format (ad-get-args 0))))
+		  (setq messages (concat messages msg-string))
+		  msg-string))
+	      (ignore-errors
+		(call-with-condition-handler
+		    #'(lambda (error-info)
+			(Print-Failure "%S ==> unexpected error %S"
+				       ,quoted-body error-info)
+			(incf other-failures)
+			(test-harness-unexpected-error-do-debug error-info))
+		    #'(lambda ()
+			(setq trick-optimizer (progn ,@body))
+			(if (string-match ,expected-message-regexp messages)
+			    (progn
+			      (Print-Pass
+			       "%S ==> value %S, message %S, matching %S, as expected"
+			       ,quoted-body trick-optimizer messages
+			       ',expected-message-regexp)
+			      (incf passes))
+			  (Print-Failure
+			   "%S ==> value %S, message %S, NOT matching expected %S"
+			   ,quoted-body  trick-optimizer messages
+			   ',expected-message-regexp)
+			  (incf missing-message-failures)))))
+	      (ad-unadvise 'message)))))
+
+      ;; #### Perhaps this should override `message' itself, too?
+      (defmacro Silence-Message (&rest body)
+	`(flet ((append-message (&rest args) ())
+                (clear-message (&rest args) ()))
+          ,@body))
+
+      (defmacro Ignore-Ebola (&rest body)
+	`(let ((debug-issue-ebola-notices -42)) ,@body))
+
+      (defun Int-to-Marker (pos)
+	(save-excursion
+	  (set-buffer standard-output)
+	  (save-excursion
+	    (goto-char pos)
+	    (point-marker))))
+
+      (princ "Testing Interpreted Lisp\n\n")
+
+      (test-harness-error-wrap
+       "executing interpreted code"
+       "Test suite execution aborted."
+       (funcall (test-harness-read-from-buffer inbuffer)))
+
+      (princ "\nTesting Compiled Lisp\n\n")
+
+      (let (code
+	    (test-harness-test-compiled t))
+	(test-harness-error-wrap
+	 "byte-compiling code" nil
+	 (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))))
+	 )
+
+	(test-harness-error-wrap "executing byte-compiled code"
+				 "Test suite execution aborted."
+				 (if code (funcall code)))
+	)
+      (princ (format "\nSUMMARY for %s:\n" filename))
+      (princ (format "\t%5d passes\n" passes))
+      (princ (format "\t%5d assertion failures\n" assertion-failures))
+      (princ (format "\t%5d errors that should have been generated, but weren't\n" no-error-failures))
+      (princ (format "\t%5d wrong-error failures\n" wrong-error-failures))
+      (princ (format "\t%5d missing-message failures\n" missing-message-failures))
+      (princ (format "\t%5d other failures\n" other-failures))
+      (let* ((total (+ passes
+		       assertion-failures
+		       no-error-failures
+		       wrong-error-failures
+		       missing-message-failures
+		       other-failures))
+	     (basename (file-name-nondirectory filename))
+	     (summary-msg
+	      (cond ((> unexpected-test-file-failures 0)
+		     (format test-harness-aborted-summary-template
+			     (concat basename ":") total))
+		    ((> total 0)
+		     (format test-harness-file-summary-template
+			     (concat basename ":")
+			     passes total (/ (* 100 passes) total)))
+		    (t
+		     (format test-harness-null-summary-template
+			     (concat basename ":")))))
+	     (reasons ""))
+	(maphash (lambda (key value)
+		   (setq reasons
+			 (concat reasons
+				 (format "\n    %d tests skipped because %s."
+					 value key))))
+		 skipped-test-reasons)
+	(when (> (length reasons) 1)
+	  (setq summary-msg (concat summary-msg reasons "
+    It may be that XEmacs cannot find your installed packages.  Set
+    EMACSPACKAGEPATH to the package hierarchy root or configure with
+    --package-path to enable the skipped tests.")))
+	(setq test-harness-file-results-alist
+	      (cons (list filename passes total)
+		    test-harness-file-results-alist))
+	(message "%s" summary-msg))
+      (when (> unexpected-test-file-failures 0)
+	(setq unexpected-test-suite-failure-files
+	      (cons filename unexpected-test-suite-failure-files))
+	(setq unexpected-test-suite-failures
+	      (+ unexpected-test-suite-failures unexpected-test-file-failures))
+	(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)
+      (and noninteractive
+	   (message "%s" (buffer-substring-no-properties
+			  nil nil "*Test-Log*")))
+      )))
+
+(defvar test-harness-results-point-max nil)
+(defmacro displaying-emacs-test-results (&rest body)
+  `(let ((test-harness-results-point-max test-harness-results-point-max))
+     ;; Log the file name.
+     (test-harness-log-file)
+     ;; Record how much is logged now.
+     ;; We will display the log buffer if anything more is logged
+     ;; before the end of BODY.
+     (or test-harness-results-point-max
+	 (save-excursion
+	   (set-buffer (get-buffer-create "*Test-Log*"))
+	   (setq test-harness-results-point-max (point-max))))
+     (unwind-protect
+	 (condition-case error-info
+	     (progn ,@body)
+	   (error
+	    (test-harness-report-error error-info)))
+       (save-excursion
+	 ;; If there were compilation warnings, display them.
+	 (set-buffer "*Test-Log*")
+	 (if (= test-harness-results-point-max (point-max))
+	     nil
+	   (if temp-buffer-show-function
+	       (let ((show-buffer (get-buffer-create "*Test-Log-Show*")))
+		 (save-excursion
+		   (set-buffer show-buffer)
+		   (setq buffer-read-only nil)
+		   (erase-buffer))
+		 (copy-to-buffer show-buffer
+				 (save-excursion
+				   (goto-char test-harness-results-point-max)
+				   (forward-line -1)
+				   (point))
+				 (point-max))
+		 (funcall temp-buffer-show-function show-buffer))
+              (select-window
+               (prog1 (selected-window)
+                 (select-window (display-buffer (current-buffer)))
+                 (goto-char test-harness-results-point-max)
+                 (recenter 1)))))))))
+
+(defun batch-test-emacs-1 (file)
+  (condition-case error-info
+      (progn (test-emacs-test-file file) t)
+    (error
+     (princ ">>Error occurred processing ")
+     (princ file)
+     (princ ": ")
+     (display-error error-info nil)
+     (terpri)
+     nil)))
+
+(defun batch-test-emacs ()
+  "Run `test-harness' on the files remaining on the command line.
+Use this from the command line, with `-batch';
+it won't work in an interactive Emacs.
+Each file is processed even if an error occurred previously.
+A directory can be given as well, and all files will be processed.
+For example, invoke \"xemacs -batch -f batch-test-emacs tests\""
+  ;; command-line-args-left is what is left of the command line (from
+  ;; startup.el)
+  (defvar command-line-args-left)	;Avoid 'free variable' warning
+  (defvar debug-issue-ebola-notices)
+  (if (not noninteractive)
+      (error "`batch-test-emacs' is to be used only with -batch"))
+  (let ((error nil))
+    (dolist (file command-line-args-left)
+      (if (file-directory-p file)
+	  (dolist (file-in-dir (directory-files file t))
+	    (when (and (string-match emacs-lisp-file-regexp file-in-dir)
+		       (not (or (auto-save-file-name-p file-in-dir)
+				(backup-file-name-p file-in-dir))))
+	      (or (batch-test-emacs-1 file-in-dir)
+		  (setq error t))))
+	(or (batch-test-emacs-1 file)
+	    (setq error t))))
+    (let ((namelen 0)
+	  (succlen 0)
+	  (testlen 0)
+	  (results test-harness-file-results-alist))
+      ;; compute maximum lengths of variable components of report
+      ;; probably should just use (length "byte-compiler-tests.el")
+      ;; and 5-place sizes -- this will also work for the file-by-file
+      ;; printing when Adrian's kludge gets reverted
+      (flet ((print-width (i)
+	       (let ((x 10) (y 1))
+		 (while (>= i x)
+		   (setq x (* 10 x) y (1+ y)))
+		 y)))
+	(while results
+	  (let* ((head (car results))
+		 (nn (length (file-name-nondirectory (first head))))
+		 (ss (print-width (second head)))
+		 (tt (print-width (third head))))
+	    (when (> nn namelen) (setq namelen nn))
+	    (when (> ss succlen) (setq succlen ss))
+	    (when (> tt testlen) (setq testlen tt)))
+	  (setq results (cdr results))))
+      ;; create format and print
+      (let ((results (reverse test-harness-file-results-alist)))
+	(while results
+	  (let* ((head (car results))
+		 (basename (file-name-nondirectory (first head)))
+		 (nsucc (second head))
+		 (ntest (third head)))
+	    (cond ((member (first head) unexpected-test-suite-failure-files)
+		   (message test-harness-aborted-summary-template
+			    (concat basename ":")
+			    ntest))
+		  ((> ntest 0)
+		   (message test-harness-file-summary-template
+			    (concat basename ":")
+			    nsucc
+			    ntest
+			    (/ (* 100 nsucc) ntest)))
+		  (t
+		   (message test-harness-null-summary-template
+			    (concat basename ":"))))
+	    (setq results (cdr results)))))
+      (when (> unexpected-test-suite-failures 0)
+	(message "\n***** There %s %d unexpected test suite %s in %s:"
+		 (if (= unexpected-test-suite-failures 1) "was" "were")
+		 unexpected-test-suite-failures
+		 (if (= unexpected-test-suite-failures 1) "failure" "failures")
+		 (if (= (length unexpected-test-suite-failure-files) 1)
+		     "file"
+		   "files"))
+	(while unexpected-test-suite-failure-files
+	  (let ((line (pop unexpected-test-suite-failure-files)))
+	    (while (and (< (length line) 61)
+			unexpected-test-suite-failure-files)
+	      (setq line
+		    (concat line " "
+			    (pop unexpected-test-suite-failure-files))))
+	    (message line)))))
+    (message "\nDone")
+    (kill-emacs (if error 1 0))))
+
+(provide 'test-harness)
+
+;;; test-harness.el ends here

--- a/src/.gdbinit.in.in	Mon Feb 22 21:26:18 2010 -0600
+++ b/src/.gdbinit.in.in	Mon Feb 22 22:04:55 2010 -0600
@@ -159,7 +159,7 @@
 end
 
 define check-xemacs-arg
-  run -vanilla -batch -l @srcdir@/../tests/automated/test-harness.el -f batch-test-emacs @srcdir@/../tests/$arg0
+  run -vanilla -batch -l test-harness -f batch-test-emacs @srcdir@/../tests/$arg0
 end
 
 define check-xemacs
@@ -178,7 +178,7 @@
 
 define check-temacs-arg
   environment-to-run-temacs
-  run -nd -no-packages -batch -l @srcdir@/../lisp/loadup.el run-temacs -q -batch -l @srcdir@/../tests/automated/test-harness.el -f batch-test-emacs @srcdir@/../tests/$arg0
+  run -nd -no-packages -batch -l @srcdir@/../lisp/loadup.el run-temacs -q -batch -l test-harness -f batch-test-emacs @srcdir@/../tests/$arg0
 
 define check-temacs
   if $argc == 0

--- a/src/ChangeLog	Mon Feb 22 21:26:18 2010 -0600
+++ b/src/ChangeLog	Mon Feb 22 22:04:55 2010 -0600
@@ -1,3 +1,9 @@
+2010-02-22  Ben Wing  <ben@xemacs.org>
+
+	* .gdbinit.in.in:
+	* Makefile.in.in (batch_test_emacs):
+	test-harness.el is in lisp directory now so change how we call it.
+
 2010-02-22  Ben Wing  <ben@xemacs.org>
 
 	* alloc.c (object_memory_usage_stats):

--- a/src/Makefile.in.in	Mon Feb 22 21:26:18 2010 -0600
+++ b/src/Makefile.in.in	Mon Feb 22 22:04:55 2010 -0600
@@ -882,7 +882,7 @@
 
 ###################### Automated tests
 testdir = $(SRC)/../tests/automated
-batch_test_emacs = $(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir)
+batch_test_emacs = $(BATCH_PACKAGES) -l test-harness -f batch-test-emacs $(testdir)
 
 ## `config-changed' is useful if you are building both Unicode-internal
 ## and old-Mule workspaces using --srcdir and don't run configure before

--- a/tests/automated/test-harness.el	Mon Feb 22 21:26:18 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,840 +0,0 @@
-;; test-harness.el --- Run Emacs Lisp test suites.
-
-;;; Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
-;;; Copyright (C) 2002, 2010 Ben Wing.
-
-;; Author: Martin Buchholz
-;; Maintainer: Stephen J. Turnbull <stephen@xemacs.org>
-;; Keywords: testing
-
-;; This file is part of XEmacs.
-
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Synched up with: Not in FSF.
-
-;;; Commentary:
-
-;;; A test suite harness for testing XEmacs.
-;;; The actual tests are in other files in this directory.
-;;; Basically you just create files of emacs-lisp, and use the
-;;; Assert, Check-Error, Check-Message, and Check-Error-Message functions
-;;; to create tests.  See `test-harness-from-buffer' below.
-;;; Don't suppress tests just because they're due to known bugs not yet
-;;; fixed -- use the Known-Bug-Expect-Failure and
-;;; Implementation-Incomplete-Expect-Failure wrapper macros to mark them.
-;;; A lot of the tests we run push limits; suppress Ebola message with the
-;;; Ignore-Ebola wrapper macro.
-;;; Some noisy code will call `message'.  Output from `message' can be
-;;; suppressed with the Silence-Message macro.  Functions that are known to
-;;; issue messages include `write-region', `find-tag', `tag-loop-continue',
-;;; `insert', and `mark-whole-buffer'.  N.B. The Silence-Message macro
-;;; currently does not suppress the newlines printed by `message'.
-;;; Definitely do not use Silence-Message with Check-Message.
-;;; In general it should probably only be used on code that prepares for a
-;;; test, not on tests.
-;;; 
-;;; You run the tests using M-x test-emacs-test-file,
-;;; or $(EMACS) -batch -l .../test-harness.el -f batch-test-emacs file ...
-;;; which is run for you by the `make check' target in the top-level Makefile.
-
-(require 'bytecomp)
-
-(defvar unexpected-test-suite-failures 0
-  "Cumulative number of unexpected failures since test-harness was loaded.
-
-\"Unexpected failures\" are those caught by a generic handler established
-outside of the test context.  As such they involve an abort of the test
-suite for the file being tested.
-
-They often occur during preparation of a test or recording of the results.
-For example, an executable used to generate test data might not be present
-on the system, or a system error might occur while reading a data file.")
-
-(defvar unexpected-test-suite-failure-files nil
-  "List of test files causing unexpected failures.")
-
-;; Declared for dynamic scope; _do not_ initialize here.
-(defvar unexpected-test-file-failures)
-
-(defvar test-harness-bug-expected nil
-  "Non-nil means a bug is expected; backtracing/debugging should not happen.")
-
-(defvar test-harness-test-compiled nil
-  "Non-nil means the test code was compiled before execution.
-
-You probably should not make tests depend on compilation.
-However, it can be useful to conditionally change messages based on whether
-the code was compiled or not.  For example, the case that motivated the
-implementation of this variable:
-
-\(when test-harness-test-compiled
-  ;; this ha-a-ack depends on the failing compiled test coming last
-  \(setq test-harness-failure-tag
-	\"KNOWN BUG - fix reverted; after 2003-10-31 notify stephen\n\"))")
-
-(defvar test-harness-verbose
-  (and (not noninteractive) (> (device-baud-rate) search-slow-speed))
-  "*Non-nil means print messages describing progress of emacs-tester.")
-
-(defvar test-harness-unexpected-error-enter-debugger debug-on-error
-  "*Non-nil means enter debugger when an unexpected error occurs.
-Only applies interactively.  Normally true if `debug-on-error' has been set.
-See also `test-harness-assertion-failure-enter-debugger' and
-`test-harness-unexpected-error-show-backtrace'.")
-
-(defvar test-harness-assertion-failure-enter-debugger debug-on-error
-  "*Non-nil means enter debugger when an assertion failure occurs.
-Only applies interactively.  Normally true if `debug-on-error' has been set.
-See also `test-harness-unexpected-error-enter-debugger' and
-`test-harness-assertion-failure-show-backtrace'.")
-
-(defvar test-harness-unexpected-error-show-backtrace t
-  "*Non-nil means show backtrace upon unexpected error.
-Only applies when debugger is not entered.  Normally true by default.  See also
-`test-harness-unexpected-error-enter-debugger' and
-`test-harness-assertion-failure-show-backtrace'.")
-
-(defvar test-harness-assertion-failure-show-backtrace stack-trace-on-error
-  "*Non-nil means show backtrace upon assertion failure.
-Only applies when debugger is not entered.  Normally true if
-`stack-trace-on-error' has been set.  See also
-`test-harness-assertion-failure-enter-debugger' and
-`test-harness-unexpected-error-show-backtrace'.")
-
-(defvar test-harness-file-results-alist nil
-  "Each element is a list (FILE SUCCESSES TESTS).
-The order is the reverse of the order in which tests are run.
-
-FILE is a string naming the test file.
-SUCCESSES is a non-negative integer, the number of successes.
-TESTS is a non-negative integer, the number of tests run.")
-
-(defvar test-harness-risk-infloops nil
-  "*Non-nil to run tests that may loop infinitely in buggy implementations.")
-
-(defvar test-harness-current-file nil)
-
-(defvar emacs-lisp-file-regexp (purecopy "\\.el\\'")
-  "*Regexp which matches Emacs Lisp source files.")
-
-(defconst test-harness-file-summary-template
-  (format "%%-%ds %%%dd of %%%dd tests successful (%%3d%%%%)."
-	  (length "byte-compiler-tests.el:") ; use the longest file name
-	  5
-	  5)
-  "Format for summary lines printed after each file is run.")
-
-(defconst test-harness-null-summary-template
-  (format "%%-%ds             No tests run."
-	  (length "byte-compiler-tests.el:")) ; use the longest file name
-  "Format for \"No tests\" lines printed after a file is run.")
-
-(defconst test-harness-aborted-summary-template
-  (format "%%-%ds          %%%dd tests completed (aborted)."
-	  (length "byte-compiler-tests.el:") ; use the longest file name
-	  5)
-  "Format for summary lines printed after a test run on a file was aborted.")
-
-;;;###autoload
-(defun test-emacs-test-file (filename)
-  "Test a file of Lisp code named FILENAME.
-The output file's name is made by appending `c' to the end of FILENAME."
-  (interactive
-   (let ((file buffer-file-name)
-	 (file-name nil)
-	 (file-dir nil))
-     (and file
-	  (eq (cdr (assq 'major-mode (buffer-local-variables)))
-	      'emacs-lisp-mode)
-	  (setq file-name (file-name-nondirectory file)
-		file-dir (file-name-directory file)))
-     (list (read-file-name "Test file: " file-dir nil nil file-name))))
-  ;; Expand now so we get the current buffer's defaults
-  (setq filename (expand-file-name filename))
-
-  ;; If we're testing a file that's in a buffer and is modified, offer
-  ;; to save it first.
-  (or noninteractive
-      (let ((b (get-file-buffer (expand-file-name filename))))
-	(if (and b (buffer-modified-p b)
-		 (y-or-n-p (format "save buffer %s first? " (buffer-name b))))
-	    (save-excursion (set-buffer b) (save-buffer)))))
-
-  (if (or noninteractive test-harness-verbose)
-      (message "Testing %s..." filename))
-  (let ((test-harness-current-file filename)
-	input-buffer)
-    (save-excursion
-      (setq input-buffer (get-buffer-create " *Test Input*"))
-      (set-buffer input-buffer)
-      (erase-buffer)
-      (insert-file-contents filename)
-      ;; Run hooks including the uncompression hook.
-      ;; If they change the file name, then change it for the output also.
-      (let ((buffer-file-name filename)
-	    (default-major-mode 'emacs-lisp-mode)
-	    (enable-local-eval nil))
-        (normal-mode)
-        (setq filename buffer-file-name)))
-    (test-harness-from-buffer input-buffer filename)
-    (kill-buffer input-buffer)
-    ))
-
-(defsubst test-harness-assertion-failure-do-debug (error-info)
-  "Maybe enter debugger or display a backtrace on assertion failure.
-ERROR-INFO is a cons of the args (SIG . DATA) that were passed to `signal'.
-The debugger will be entered if noninteractive and
-`test-harness-unexpected-error-enter-debugger' is non-nil; else, a
-backtrace will be displayed if `test-harness-unexpected-error-show-backtrace'
-is non-nil."
-  (when (not test-harness-bug-expected)
-    (cond ((and (not noninteractive)
-		test-harness-assertion-failure-enter-debugger)
-	   (funcall debugger 'error error-info))
-	  (test-harness-assertion-failure-show-backtrace
-	   (backtrace nil t)))))
-
-(defsubst test-harness-unexpected-error-do-debug (error-info)
-  "Maybe enter debugger or display a backtrace on unexpected error.
-ERROR-INFO is a cons of the args (SIG . DATA) that were passed to `signal'.
-The debugger will be entered if noninteractive and
-`test-harness-unexpected-error-enter-debugger' is non-nil; else, a
-backtrace will be displayed if `test-harness-unexpected-error-show-backtrace'
-is non-nil."
-  (when (not test-harness-bug-expected)
-    (cond ((and (not noninteractive)
-		test-harness-unexpected-error-enter-debugger)
-	   (funcall debugger 'error error-info))
-	  (test-harness-unexpected-error-show-backtrace
-	   (backtrace nil t)))))
-
-(defsubst test-harness-unexpected-error-condition-handler (error-info context-msg)
-  "Condition handler for when unexpected errors occur.
-Useful in conjunction with `call-with-condition-handler'.  ERROR-INFO is the
-value passed to the condition handler.  CONTEXT-MSG is a string indicating
-the context in which the unexpected error occurred.  A message is outputted
-including CONTEXT-MSG in it, `unexpected-test-file-failures' is incremented,
-and `test-harness-unexpected-error-do-debug' is called, which may enter the
-debugger or output a backtrace, depending on the settings of
-`test-harness-unexpected-error-enter-debugger' and
-`test-harness-unexpected-error-show-backtrace'.
-
-The function returns normally, which causes error-handling processing to
-continue; if you want to catch the error, you also need to wrap everything
-in `condition-case'.  See also `test-harness-error-wrap', which does this
-wrapping."
-  (incf unexpected-test-file-failures)
-  (princ (format "Unexpected error %S while %s\n"
-		 error-info context-msg))
-  (message "Unexpected error %S while %s." error-info context-msg)
-  (test-harness-unexpected-error-do-debug error-info))
-
-(defmacro test-harness-error-wrap (context-msg abort-msg &rest body)
-  "Wrap BODY so that unexpected errors are caught.
-The debugger will be entered if noninteractive and
-`test-harness-unexpected-error-enter-debugger' is non-nil; else, a backtrace
-will be displayed if `test-harness-unexpected-error-show-backtrace' is
-non-nil.  CONTEXT-MSG is displayed as part of a message shown before entering
-the debugger or showing a backtrace, and ABORT-MSG, if non-nil, is displayed
-afterwards.  See "
-  `(condition-case nil
-    (call-with-condition-handler
-	#'(lambda (error-info)
-	    (test-harness-unexpected-error-condition-handler
-	     error-info ,context-msg))
-	#'(lambda ()
-	    ,@body))
-    (error ,(if abort-msg `(message ,abort-msg) nil))))
-
-(defun test-harness-read-from-buffer (buffer)
-  "Read forms from BUFFER, and turn it into a lambda test form."
-  (let ((body nil))
-    (goto-char (point-min) buffer)
-    (condition-case nil
-	(call-with-condition-handler
-	    #'(lambda (error-info)
-		;; end-of-file is expected, so don't output error or backtrace
-		;; or enter debugger in this case.
-		(unless (eq 'end-of-file (car error-info))
-		  (test-harness-unexpected-error-condition-handler
-		   error-info "reading forms from buffer")))
-	    #'(lambda ()
-		(while t
-		  (setq body (cons (read buffer) body)))))
-      (error nil))
-    `(lambda ()
-       (defvar passes)
-       (defvar assertion-failures)
-       (defvar no-error-failures)
-       (defvar wrong-error-failures)
-       (defvar missing-message-failures)
-       (defvar other-failures)
-
-       (defvar trick-optimizer)
-
-       ,@(nreverse body))))
-
-(defun test-harness-from-buffer (inbuffer filename)
-  "Run tests in buffer INBUFFER, visiting FILENAME."
-  (defvar trick-optimizer)
-  (let ((passes 0)
-	(assertion-failures 0)
-	(no-error-failures 0)
-	(wrong-error-failures 0)
-	(missing-message-failures 0)
-	(other-failures 0)
-	(unexpected-test-file-failures 0)
-
-	;; #### perhaps this should be a defvar, and output at the very end
-	;; OTOH, this way AC types can use a null EMACSPACKAGEPATH to find
-	;; what stuff is needed, and ways to avoid using them
-	(skipped-test-reasons (make-hash-table :test 'equal))
-
-	(trick-optimizer nil)
-	(debug-on-error t)
-	)
-    (with-output-to-temp-buffer "*Test-Log*"
-      (princ (format "Testing %s...\n\n" filename))
-
-      (defconst test-harness-failure-tag "FAIL")
-      (defconst test-harness-success-tag "PASS")
-
-;;;;; BEGIN DEFINITION OF MACROS USEFUL IN TEST CODE
-
-      (defmacro Known-Bug-Expect-Failure (&rest body)
-	"Wrap a BODY that consists of tests that are known to fail.
-This causes messages to be printed on failure indicating that this is expected,
-and on success indicating that this is unexpected."
-	`(let ((test-harness-bug-expected t)
-	       (test-harness-failure-tag "KNOWN BUG")
-	       (test-harness-success-tag "PASS (FAILURE EXPECTED)"))
-	  ,@body))
-
-      (defmacro Known-Bug-Expect-Error (expected-error &rest body)
-	"Wrap a BODY that consists of tests that are known to trigger an error.
-This causes messages to be printed on failure indicating that this is expected,
-and on success indicating that this is unexpected."
-	(let ((quoted-body (if (= 1 (length body))
-			       `(quote ,(car body)) `(quote (progn ,@body)))))
-          `(let ((test-harness-bug-expected t)
-		 (test-harness-failure-tag "KNOWN BUG")
-                 (test-harness-success-tag "PASS (FAILURE EXPECTED)"))
-            (condition-case error-info
-                (progn
-                  (setq trick-optimizer (progn ,@body))
-                  (Print-Pass 
-                   "%S executed successfully, but expected error %S"
-                   ,quoted-body
-                   ',expected-error)
-                  (incf passes))
-              (,expected-error
-               (Print-Failure "%S ==> error %S, as expected"
-                              ,quoted-body ',expected-error)
-               (incf no-error-failures))
-              (error
-               (Print-Failure "%S ==> expected error %S, got error %S instead"
-                              ,quoted-body ',expected-error error-info)
-               (incf wrong-error-failures))))))
-
-      (defmacro Implementation-Incomplete-Expect-Failure (&rest body)
-	"Wrap a BODY containing tests that are known to fail due to incomplete code.
-This causes messages to be printed on failure indicating that the
-implementation is incomplete (and hence the failure is expected); and on
-success indicating that this is unexpected."
-	`(let ((test-harness-bug-expected t)
-	       (test-harness-failure-tag "IMPLEMENTATION INCOMPLETE")
-	       (test-harness-success-tag "PASS (FAILURE EXPECTED)"))
-	  ,@body))
-    
-      (defun Print-Failure (fmt &rest args)
-	(setq fmt (format "%s: %s" test-harness-failure-tag fmt))
-	(if (noninteractive) (apply #'message fmt args))
-	(princ (concat (apply #'format fmt args) "\n")))
-
-      (defun Print-Pass (fmt &rest args)
-	(setq fmt (format "%s: %s" test-harness-success-tag fmt))
-	(and test-harness-verbose
-	     (princ (concat (apply #'format fmt args) "\n"))))
-
-      (defun Print-Skip (test reason &optional fmt &rest args)
-	(setq fmt (concat "SKIP: %S BECAUSE %S" fmt))
-	(princ (concat (apply #'format fmt test reason args) "\n")))
-
-      (defmacro Skip-Test-Unless (condition reason description &rest body)
-	"Unless CONDITION is satisfied, skip test BODY.
-REASON is a description of the condition failure, and must be unique (it
-is used as a hash key).  DESCRIPTION describes the tests that were skipped.
-BODY is a sequence of expressions and may contain several tests."
-	`(if (not ,condition)
-	     (let ((count (gethash ,reason skipped-test-reasons)))
-	       (puthash ,reason (if (null count) 1 (1+ count))
-			skipped-test-reasons)
-	       (Print-Skip ,description ,reason))
-	   ,@body))
-
-      (defmacro Assert (assertion &optional failing-case description)
-	"Test passes if ASSERTION is true.
-Optional FAILING-CASE describes the particular failure.  Optional
-DESCRIPTION describes the assertion; by default, the unevalated assertion
-expression is given.  FAILING-CASE and DESCRIPTION are useful when Assert
-is used in a loop."
-	(let ((description
-	       (or description `(quote ,assertion))))
-	  `(condition-case nil
-	    (call-with-condition-handler
-		#'(lambda (error-info)
-		    (if (eq 'cl-assertion-failed (car error-info))
-			(progn
-			  (Print-Failure
-			   (if ,failing-case
-			       "Assertion failed: %S; failing case = %S"
-			     "Assertion failed: %S")
-			   ,description ,failing-case)
-			  (incf assertion-failures)
-			  (test-harness-assertion-failure-do-debug error-info))
-		      (Print-Failure
-		       (if ,failing-case
-			   "%S ==> error: %S; failing case =  %S"
-			 "%S ==> error: %S")
-		       ,description error-info ,failing-case)
-		      (incf other-failures)
-		      (test-harness-unexpected-error-do-debug error-info)))
-		#'(lambda ()
-		    (assert ,assertion)
-		    (Print-Pass "%S" ,description)
-		    (incf passes)))
-	    (cl-assertion-failed nil))))
-
-;;;;; BEGIN DEFINITION OF SPECIFIC KINDS OF ASSERT MACROS
-
-      (defmacro Assert-test (test testval expected &optional failing-case
-			     description)
-	"Test passes if TESTVAL compares correctly to EXPECTED using TEST.
-TEST should be a two-argument predicate (i.e. a function of two arguments
-that returns t or nil), such as `eq', `eql', `equal', `equalp', `=', `<=',
-'>', 'file-newer-than-file-p' etc.  Optional FAILING-CASE describes the
-particular failure; any value given here will be concatenated with a phrase
-describing the expected and actual values of the comparison.  Optional
-DESCRIPTION describes the assertion; by default, the unevalated comparison
-expressions are given.  FAILING-CASE and DESCRIPTION are useful when Assert
-is used in a loop."
-	(let* ((assertion `(,test ,testval ,expected))
-	       (failmsg `(format "%S should be `%s' to %S but isn't"
-			  ,testval ',test ,expected))
-	       (failmsg2 (if failing-case `(concat 
-					   (format "%S, " ,failing-case)
-					   ,failmsg)
-			  failmsg)))
-	  `(Assert ,assertion ,failmsg2 ,description)))
-
-      (defmacro Assert-test-not (test testval expected &optional failing-case
-				 description)
-	"Test passes if TESTVAL does not compare correctly to EXPECTED using TEST.
-TEST should be a two-argument predicate (i.e. a function of two arguments
-that returns t or nil), such as `eq', `eql', `equal', `equalp', `=', `<=',
-'>', 'file-newer-than-file-p' etc.  Optional FAILING-CASE describes the
-particular failure; any value given here will be concatenated with a phrase
-describing the expected and actual values of the comparison.  Optional
-DESCRIPTION describes the assertion; by default, the unevalated comparison
-expressions are given.  FAILING-CASE and DESCRIPTION are useful when Assert
-is used in a loop."
-	(let* ((assertion `(not (,test ,testval ,expected)))
-	       (failmsg `(format "%S shouldn't be `%s' to %S but is"
-			  ,testval ',test ,expected))
-	       (failmsg2 (if failing-case `(concat 
-					   (format "%S, " ,failing-case)
-					   ,failmsg)
-			  failmsg)))
-	  `(Assert ,assertion ,failmsg2 ,description)))
-
-      ;; Specific versions of `Assert-test'.  These are just convenience
-      ;; functions, functioning identically to `Assert-test', and duplicating
-      ;; the doc string for each would be too annoying.
-      (defmacro Assert-eq (testval expected &optional failing-case
-			   description)
-	`(Assert-test eq ,testval ,expected ,failing-case ,description))
-      (defmacro Assert-eql (testval expected &optional failing-case
-			    description)
-	`(Assert-test eql ,testval ,expected ,failing-case ,description))
-      (defmacro Assert-equal (testval expected &optional failing-case
-			      description)
-	`(Assert-test equal ,testval ,expected ,failing-case ,description))
-      (defmacro Assert-equalp (testval expected &optional failing-case
-			      description)
-	`(Assert-test equalp ,testval ,expected ,failing-case ,description))
-      (defmacro Assert-string= (testval expected &optional failing-case
-			      description)
-	`(Assert-test string= ,testval ,expected ,failing-case ,description))
-      (defmacro Assert= (testval expected &optional failing-case
-			 description)
-	`(Assert-test = ,testval ,expected ,failing-case ,description))
-      (defmacro Assert<= (testval expected &optional failing-case
-			  description)
-	`(Assert-test <= ,testval ,expected ,failing-case ,description))
-
-      ;; Specific versions of `Assert-test-not'.  These are just convenience
-      ;; functions, functioning identically to `Assert-test-not', and
-      ;; duplicating the doc string for each would be too annoying.
-      (defmacro Assert-not-eq (testval expected &optional failing-case
-			       description)
-	`(Assert-test-not eq ,testval ,expected ,failing-case ,description))
-      (defmacro Assert-not-eql (testval expected &optional failing-case
-				description)
-	`(Assert-test-not eql ,testval ,expected ,failing-case ,description))
-      (defmacro Assert-not-equal (testval expected &optional failing-case
-				  description)
-	`(Assert-test-not equal ,testval ,expected ,failing-case ,description))
-      (defmacro Assert-not-equalp (testval expected &optional failing-case
-				   description)
-	`(Assert-test-not equalp ,testval ,expected ,failing-case ,description))
-      (defmacro Assert-not-string= (testval expected &optional failing-case
-				    description)
-	`(Assert-test-not string= ,testval ,expected ,failing-case ,description))
-      (defmacro Assert-not= (testval expected &optional failing-case
-			     description)
-	`(Assert-test-not = ,testval ,expected ,failing-case ,description))
-
-      (defmacro Check-Error (expected-error &rest body)
-	(let ((quoted-body (if (= 1 (length body))
-			       `(quote ,(car body)) `(quote (progn ,@body)))))
-	  `(condition-case error-info
-	       (progn
-		 (setq trick-optimizer (progn ,@body))
-		 (Print-Failure "%S executed successfully, but expected error %S"
-				,quoted-body
-				',expected-error)
-		 (incf no-error-failures))
-	     (,expected-error
-	      (Print-Pass "%S ==> error %S, as expected"
-			  ,quoted-body ',expected-error)
-	      (incf passes))
-	     (error
-	      (Print-Failure "%S ==> expected error %S, got error %S instead"
-			     ,quoted-body ',expected-error error-info)
-	      (incf wrong-error-failures)))))
-
-      (defmacro Check-Error-Message (expected-error expected-error-regexp
-						    &rest body)
-	(let ((quoted-body (if (= 1 (length body))
-			       `(quote ,(car body)) `(quote (progn ,@body)))))
-	  `(condition-case error-info
-	       (progn
-		 (setq trick-optimizer (progn ,@body))
-		 (Print-Failure "%S executed successfully, but expected error %S"
-				,quoted-body ',expected-error)
-		 (incf no-error-failures))
-	     (,expected-error
-	      ;; #### Damn, this binding doesn't capture frobs, eg, for
-	      ;; invalid_argument() ... you only get the REASON.  And for
-	      ;; wrong_type_argument(), there's no reason only FROBs.
-	      ;; If this gets fixed, fix tests in regexp-tests.el.
-	      (let ((error-message (second error-info)))
-		(if (string-match ,expected-error-regexp error-message)
-		    (progn
-		      (Print-Pass "%S ==> error %S %S, as expected"
-				  ,quoted-body error-message ',expected-error)
-		      (incf passes))
-		  (Print-Failure "%S ==> got error %S as expected, but error message %S did not match regexp %S"
-				 ,quoted-body ',expected-error error-message ,expected-error-regexp)
-		  (incf wrong-error-failures))))
-	     (error
-	      (Print-Failure "%S ==> expected error %S, got error %S instead"
-			     ,quoted-body ',expected-error error-info)
-	      (incf wrong-error-failures)))))
-
-      ;; Do not use this with Silence-Message.
-      (defmacro Check-Message (expected-message-regexp &rest body)
-	(Skip-Test-Unless (fboundp 'defadvice)
-			  "can't defadvice"
-			  expected-message-regexp
-	  (let ((quoted-body (if (= 1 (length body))
-				 `(quote ,(car body))
-			       `(quote (progn ,@body)))))
-	    `(let ((messages ""))
-	       (defadvice message (around collect activate)
-		 (defvar messages)
-		 (let ((msg-string (apply 'format (ad-get-args 0))))
-		   (setq messages (concat messages msg-string))
-		   msg-string))
-	       (ignore-errors
-		 (call-with-condition-handler
-		     #'(lambda (error-info)
-			 (Print-Failure "%S ==> unexpected error %S"
-					,quoted-body error-info)
-			 (incf other-failures)
-			 (test-harness-unexpected-error-do-debug error-info))
-		     #'(lambda ()
-			 (setq trick-optimizer (progn ,@body))
-			 (if (string-match ,expected-message-regexp messages)
-			     (progn
-			       (Print-Pass
-				"%S ==> value %S, message %S, matching %S, as expected"
-				,quoted-body trick-optimizer messages
-				',expected-message-regexp)
-			       (incf passes))
-			   (Print-Failure
-			    "%S ==> value %S, message %S, NOT matching expected %S"
-			    ,quoted-body  trick-optimizer messages
-			    ',expected-message-regexp)
-			   (incf missing-message-failures)))))
-	       (ad-unadvise 'message)))))
-
-      ;; #### Perhaps this should override `message' itself, too?
-      (defmacro Silence-Message (&rest body)
-	`(flet ((append-message (&rest args) ())
-                (clear-message (&rest args) ()))
-          ,@body))
-
-      (defmacro Ignore-Ebola (&rest body)
-	`(let ((debug-issue-ebola-notices -42)) ,@body))
-
-      (defun Int-to-Marker (pos)
-	(save-excursion
-	  (set-buffer standard-output)
-	  (save-excursion
-	    (goto-char pos)
-	    (point-marker))))
-
-      (princ "Testing Interpreted Lisp\n\n")
-
-      (test-harness-error-wrap
-       "executing interpreted code"
-       "Test suite execution aborted."
-       (funcall (test-harness-read-from-buffer inbuffer)))
-
-      (princ "\nTesting Compiled Lisp\n\n")
-
-      (let (code
-	    (test-harness-test-compiled t))
-	(test-harness-error-wrap
-	 "byte-compiling code" nil
-	 (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))))
-	 )
-
-	(test-harness-error-wrap "executing byte-compiled code"
-				 "Test suite execution aborted."
-				 (if code (funcall code)))
-	)
-      (princ (format "\nSUMMARY for %s:\n" filename))
-      (princ (format "\t%5d passes\n" passes))
-      (princ (format "\t%5d assertion failures\n" assertion-failures))
-      (princ (format "\t%5d errors that should have been generated, but weren't\n" no-error-failures))
-      (princ (format "\t%5d wrong-error failures\n" wrong-error-failures))
-      (princ (format "\t%5d missing-message failures\n" missing-message-failures))
-      (princ (format "\t%5d other failures\n" other-failures))
-      (let* ((total (+ passes
-		       assertion-failures
-		       no-error-failures
-		       wrong-error-failures
-		       missing-message-failures
-		       other-failures))
-	     (basename (file-name-nondirectory filename))
-	     (summary-msg
-	      (cond ((> unexpected-test-file-failures 0)
-		     (format test-harness-aborted-summary-template
-			     (concat basename ":") total))
-		    ((> total 0)
-		     (format test-harness-file-summary-template
-			     (concat basename ":")
-			     passes total (/ (* 100 passes) total)))
-		    (t
-		     (format test-harness-null-summary-template
-			     (concat basename ":")))))
-	     (reasons ""))
-	(maphash (lambda (key value)
-		   (setq reasons
-			 (concat reasons
-				 (format "\n    %d tests skipped because %s."
-					 value key))))
-		 skipped-test-reasons)
-	(when (> (length reasons) 1)
-	  (setq summary-msg (concat summary-msg reasons "
-    It may be that XEmacs cannot find your installed packages.  Set
-    EMACSPACKAGEPATH to the package hierarchy root or configure with
-    --package-path to enable the skipped tests.")))
-	(setq test-harness-file-results-alist
-	      (cons (list filename passes total)
-		    test-harness-file-results-alist))
-	(message "%s" summary-msg))
-      (when (> unexpected-test-file-failures 0)
-	(setq unexpected-test-suite-failure-files
-	      (cons filename unexpected-test-suite-failure-files))
-	(setq unexpected-test-suite-failures
-	      (+ unexpected-test-suite-failures unexpected-test-file-failures))
-	(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)
-      (and noninteractive
-	   (message "%s" (buffer-substring-no-properties
-			  nil nil "*Test-Log*")))
-      )))
-
-(defvar test-harness-results-point-max nil)
-(defmacro displaying-emacs-test-results (&rest body)
-  `(let ((test-harness-results-point-max test-harness-results-point-max))
-     ;; Log the file name.
-     (test-harness-log-file)
-     ;; Record how much is logged now.
-     ;; We will display the log buffer if anything more is logged
-     ;; before the end of BODY.
-     (or test-harness-results-point-max
-	 (save-excursion
-	   (set-buffer (get-buffer-create "*Test-Log*"))
-	   (setq test-harness-results-point-max (point-max))))
-     (unwind-protect
-	 (condition-case error-info
-	     (progn ,@body)
-	   (error
-	    (test-harness-report-error error-info)))
-       (save-excursion
-	 ;; If there were compilation warnings, display them.
-	 (set-buffer "*Test-Log*")
-	 (if (= test-harness-results-point-max (point-max))
-	     nil
-	   (if temp-buffer-show-function
-	       (let ((show-buffer (get-buffer-create "*Test-Log-Show*")))
-		 (save-excursion
-		   (set-buffer show-buffer)
-		   (setq buffer-read-only nil)
-		   (erase-buffer))
-		 (copy-to-buffer show-buffer
-				 (save-excursion
-				   (goto-char test-harness-results-point-max)
-				   (forward-line -1)
-				   (point))
-				 (point-max))
-		 (funcall temp-buffer-show-function show-buffer))
-              (select-window
-               (prog1 (selected-window)
-                 (select-window (display-buffer (current-buffer)))
-                 (goto-char test-harness-results-point-max)
-                 (recenter 1)))))))))
-
-(defun batch-test-emacs-1 (file)
-  (condition-case error-info
-      (progn (test-emacs-test-file file) t)
-    (error
-     (princ ">>Error occurred processing ")
-     (princ file)
-     (princ ": ")
-     (display-error error-info nil)
-     (terpri)
-     nil)))
-
-(defun batch-test-emacs ()
-  "Run `test-harness' on the files remaining on the command line.
-Use this from the command line, with `-batch';
-it won't work in an interactive Emacs.
-Each file is processed even if an error occurred previously.
-A directory can be given as well, and all files will be processed --
-however, the file test-harness.el, which implements the test harness,
-will be skipped.
-For example, invoke \"xemacs -batch -f batch-test-emacs tests\""
-  ;; command-line-args-left is what is left of the command line (from
-  ;; startup.el)
-  (defvar command-line-args-left)	;Avoid 'free variable' warning
-  (defvar debug-issue-ebola-notices)
-  (if (not noninteractive)
-      (error "`batch-test-emacs' is to be used only with -batch"))
-  (let ((error nil))
-    (dolist (file command-line-args-left)
-      (if (file-directory-p file)
-	  (dolist (file-in-dir (directory-files file t))
-	    (when (and (string-match emacs-lisp-file-regexp file-in-dir)
-		       (not (or (auto-save-file-name-p file-in-dir)
-				(backup-file-name-p file-in-dir)
-				(equal (file-name-nondirectory file-in-dir)
-				       "test-harness.el"))))
-	      (or (batch-test-emacs-1 file-in-dir)
-		  (setq error t))))
-	(or (batch-test-emacs-1 file)
-	    (setq error t))))
-    (let ((namelen 0)
-	  (succlen 0)
-	  (testlen 0)
-	  (results test-harness-file-results-alist))
-      ;; compute maximum lengths of variable components of report
-      ;; probably should just use (length "byte-compiler-tests.el")
-      ;; and 5-place sizes -- this will also work for the file-by-file
-      ;; printing when Adrian's kludge gets reverted
-      (flet ((print-width (i)
-	       (let ((x 10) (y 1))
-		 (while (>= i x)
-		   (setq x (* 10 x) y (1+ y)))
-		 y)))
-	(while results
-	  (let* ((head (car results))
-		 (nn (length (file-name-nondirectory (first head))))
-		 (ss (print-width (second head)))
-		 (tt (print-width (third head))))
-	    (when (> nn namelen) (setq namelen nn))
-	    (when (> ss succlen) (setq succlen ss))
-	    (when (> tt testlen) (setq testlen tt)))
-	  (setq results (cdr results))))
-      ;; create format and print
-      (let ((results (reverse test-harness-file-results-alist)))
-	(while results
-	  (let* ((head (car results))
-		 (basename (file-name-nondirectory (first head)))
-		 (nsucc (second head))
-		 (ntest (third head)))
-	    (cond ((member (first head) unexpected-test-suite-failure-files)
-		   (message test-harness-aborted-summary-template
-			    (concat basename ":")
-			    ntest))
-		  ((> ntest 0)
-		   (message test-harness-file-summary-template
-			    (concat basename ":")
-			    nsucc
-			    ntest
-			    (/ (* 100 nsucc) ntest)))
-		  (t
-		   (message test-harness-null-summary-template
-			    (concat basename ":"))))
-	    (setq results (cdr results)))))
-      (when (> unexpected-test-suite-failures 0)
-	(message "\n***** There %s %d unexpected test suite %s in %s:"
-		 (if (= unexpected-test-suite-failures 1) "was" "were")
-		 unexpected-test-suite-failures
-		 (if (= unexpected-test-suite-failures 1) "failure" "failures")
-		 (if (= (length unexpected-test-suite-failure-files) 1)
-		     "file"
-		   "files"))
-	(while unexpected-test-suite-failure-files
-	  (let ((line (pop unexpected-test-suite-failure-files)))
-	    (while (and (< (length line) 61)
-			unexpected-test-suite-failure-files)
-	      (setq line
-		    (concat line " "
-			    (pop unexpected-test-suite-failure-files))))
-	    (message line)))))
-    (message "\nDone")
-    (kill-emacs (if error 1 0))))
-
-(provide 'test-harness)
-
-;;; test-harness.el ends here