Mercurial > hg > xemacs-beta
view tests/automated/test-harness.el @ 934:c925bacdda60
[xemacs-hg @ 2002-07-29 09:21:12 by michaels]
2002-07-17 Marcus Crestani <crestani@informatik.uni-tuebingen.de>
Markus Kaltenbach <makalten@informatik.uni-tuebingen.de>
Mike Sperber <mike@xemacs.org>
configure flag to turn these changes on: --use-kkcc
First we added a dumpable flag to lrecord_implementation. It shows,
if the object is dumpable and should be processed by the dumper.
* lrecord.h (struct lrecord_implementation): added dumpable flag
(MAKE_LRECORD_IMPLEMENTATION): fitted the different makro definitions
to the new lrecord_implementation and their calls.
Then we changed mark_object, that it no longer needs a mark method for
those types that have pdump descritions.
* alloc.c:
(mark_object): If the object has a description, the new mark algorithm
is called, and the object is marked according to its description.
Otherwise it uses the mark method like before.
These procedures mark objects according to their descriptions. They
are modeled on the corresponding pdumper procedures.
(mark_with_description):
(get_indirect_count):
(structure_size):
(mark_struct_contents):
These procedures still call mark_object, this is needed while there are
Lisp_Objects without descriptions left.
We added pdump descriptions for many Lisp_Objects:
* extents.c: extent_auxiliary_description
* database.c: database_description
* gui.c: gui_item_description
* scrollbar.c: scrollbar_instance_description
* toolbar.c: toolbar_button_description
* event-stream.c: command_builder_description
* mule-charset.c: charset_description
* device-msw.c: devmode_description
* dialog-msw.c: mswindows_dialog_id_description
* eldap.c: ldap_description
* postgresql.c: pgconn_description
pgresult_description
* tooltalk.c: tooltalk_message_description
tooltalk_pattern_description
* ui-gtk.c: emacs_ffi_description
emacs_gtk_object_description
* events.c:
* events.h:
* event-stream.c:
* event-Xt.c:
* event-gtk.c:
* event-tty.c:
To write a pdump description for Lisp_Event, we converted every struct
in the union event to a Lisp_Object. So we created nine new
Lisp_Objects: Lisp_Key_Data, Lisp_Button_Data, Lisp_Motion_Data,
Lisp_Process_Data, Lisp_Timeout_Data, Lisp_Eval_Data,
Lisp_Misc_User_Data, Lisp_Magic_Data, Lisp_Magic_Eval_Data.
We also wrote makro selectors and mutators for the fields of the new
designed Lisp_Event and added everywhere these new abstractions.
We implemented XD_UNION support in (mark_with_description), so
we can describe exspecially console/device specific data with XD_UNION.
To describe with XD_UNION, we added a field to these objects, which
holds the variant type of the object. This field is initialized in
the appendant constructor. The variant is an integer, it has also to
be described in an description, if XD_UNION is used.
XD_UNION is used in following descriptions:
* console.c: console_description
(get_console_variant): returns the variant
(create_console): added variant initialization
* console.h (console_variant): the different console types
* console-impl.h (struct console): added enum console_variant contype
* device.c: device_description
(Fmake_device): added variant initialization
* device-impl.h (struct device): added enum console_variant devtype
* objects.c: image_instance_description
font_instance_description
(Fmake_color_instance): added variant initialization
(Fmake_font_instance): added variant initialization
* objects-impl.h (struct Lisp_Color_Instance): added color_instance_type
* objects-impl.h (struct Lisp_Font_Instance): added font_instance_type
* process.c: process_description
(make_process_internal): added variant initialization
* process.h (process_variant): the different process types
author | michaels |
---|---|
date | Mon, 29 Jul 2002 09:21:25 +0000 |
parents | 17ba576dc36a |
children | ea6a06f7bf2c |
line wrap: on
line source
;; test-harness.el --- Run Emacs Lisp test suites. ;;; Copyright (C) 1998 Free Software Foundation, Inc. ;;; Copyright (C) 2002 Ben Wing. ;; Author: Martin Buchholz ;; 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, and Check-Message functions to create 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 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-current-file nil) (defvar emacs-lisp-file-regexp (purecopy "\\.el\\'") "*Regexp which matches Emacs Lisp source files.") ;;;###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) )) (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 error-info (while t (setq body (cons (read buffer) body))) (end-of-file nil) (error (princ (format "Unexpected error %S reading forms from buffer\n" error-info)))) `(lambda () (defvar passes) (defvar assertion-failures) (defvar no-error-failures) (defvar wrong-error-failures) (defvar missing-message-failures) (defvar other-failures) (defvar unexpected-test-suite-failure) (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) (trick-optimizer nil) (unexpected-test-suite-failure nil) (debug-on-error t) (pass-stream nil)) (with-output-to-temp-buffer "*Test-Log*" (princ (format "Testing %s...\n\n" filename)) (defun Print-Failure (fmt &rest args) (setq fmt (concat "FAIL: " fmt)) (if (noninteractive) (apply #'message fmt args)) (princ (concat (apply #'format fmt args) "\n"))) (defun Print-Pass (fmt &rest args) (setq fmt (concat "PASS: " fmt)) (and test-harness-verbose (princ (concat (apply #'format fmt args) "\n")))) (defmacro Assert (assertion) `(condition-case error-info (progn (assert ,assertion) (Print-Pass "%S" (quote ,assertion)) (incf passes)) (cl-assertion-failed (Print-Failure "Assertion failed: %S" (quote ,assertion)) (incf assertion-failures)) (t (Print-Failure "%S ==> error: %S" (quote ,assertion) error-info) (incf other-failures) ))) (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 (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))))) (defmacro Check-Message (expected-message-regexp &rest body) (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)) (condition-case error-info (progn (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))) (error (Print-Failure "%S ==> unexpected error %S" ,quoted-body error-info) (incf other-failures))) (ad-unadvise 'message)))) (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") (condition-case error-info (funcall (test-harness-read-from-buffer inbuffer)) (error (setq unexpected-test-suite-failure t) (princ (format "Unexpected error %S while executing interpreted code\n" error-info)) (message "Unexpected error %S while executing interpreted code." error-info) (message "Test suite execution aborted." error-info) )) (princ "\nTesting Compiled Lisp\n\n") (let (code) (condition-case error-info (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)))) (condition-case error-info (if code (funcall code)) (error (princ (format "Unexpected error %S while executing byte-compiled code\n" error-info)) (message "Unexpected error %S while executing byte-compiled code." error-info) (message "Test suite execution aborted." error-info) ))) (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 (if (> total 0) (format "%s: %d of %d (%d%%) tests successful." basename passes total (/ (* 100 passes) total)) (format "%s: No tests run" basename)))) (message "%s" summary-msg)) (when unexpected-test-suite-failure (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) ))) (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. For example, invoke \"xemacs -batch -f batch-test-emacs tests/*.el\"" ;; 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)))) ;;(message "%s" (buffer-string nil nil "*Test-Log*")) (message "Done") (kill-emacs (if error 1 0)))) (provide 'test-harness) ;;; test-harness.el ends here