Mercurial > emacs
annotate lisp/eshell/esh-test.el @ 111870:b47e85affa59
Derive from prog-mode, use derived-mode-p, and fix up various
minor style issues in lisp/progmodes.
* lisp/progmodes/vhdl-mode.el (vhdl-write-file-hooks-init)
(vhdl-hs-minor-mode, vhdl-ps-print-init): Fix make-local-variable ->
make-local-hook.
* lisp/progmodes/sh-script.el (sh-require-final-newline): Remove.
(sh-set-shell): Don't set require-final-newline since it's already done
by prog-mode.
* lisp/progmodes/modula2.el (m2-mode): Don't make m2-end-comment-column
since we never set it.
* lisp/progmodes/ebrowse.el (ebrowse-set-tree-indentation):
Use read-string and standard prompt.
* lisp/progmodes/dcl-mode.el (dcl-mode-map): Move init into declaration.
* lisp/progmodes/meta-mode.el (meta-mode-abbrev-table): Merge init and decl.
(meta-common-mode-syntax-table): Rename from meta-mode-syntax-table.
(meta-common-mode-map): Rename from meta-mode-map.
Remove C-m binding, which is a user preference, not mode specific.
(meta-common-mode): New major mode; replace meta-common-initialization.
* lisp/progmodes/js.el (js-mode): Call syntax-propertize rather than messing
around with font-lock.
* lisp/progmodes/etags.el (select-tags-table-mode):
Derive from special-mode.
* lisp/progmodes/octave-mod.el (octave-mode):
* lisp/progmodes/gdb-mi.el (gdb-inferior-io-mode, gdb-threads-mode)
(gdb-memory-mode, gdb-disassembly-mode, gdb-breakpoints-mode)
(gdb-frames-mode, gdb-locals-mode, gdb-registers-mode):
Let define-derived-mode do its job.
* lisp/progmodes/cpp.el (cpp-edit-mode-map):
Move initialization into declaration.
(cpp-edit-mode): Use define-derived-mode.
(cpp-edit-load): Use derived-mode-p.
* lisp/progmodes/mixal-mode.el (mixal-mode):
* lisp/progmodes/f90.el (f90-mode):
* lisp/progmodes/cfengine.el (cfengine-mode): Don't bother setting
require-final-newline since prog-mode does it already.
* lisp/progmodes/cc-cmds.el (c-update-modeline): Use match-string.
* lisp/progmodes/asm-mode.el (asm-mode-map): Fix menu setup.
* lisp/progmodes/antlr-mode.el: Require cc-mode upfront.
(antlr-mode-syntax-table, antlr-action-syntax-table): Initialize in
the declaration.
(antlr-directory-dependencies, antlr-show-makefile-rules):
Use derived-mode-p.
(antlr-language-option): Don't assume point-min==1.
(antlr-mode): Use define-derived-mode.
* lisp/progmodes/ada-mode.el: Use derived-mode-p.
(ada-mode): Use define-derived-mode.
Use hack-local-variables-hook.
* lisp/progmodes/vhdl-mode.el (vhdl-mode):
* lisp/progmodes/verilog-mode.el (verilog-mode):
* lisp/progmodes/vera-mode.el (vera-mode):
* lisp/progmodes/sql.el (sql-mode):
* lisp/progmodes/scheme.el (scheme-mode):
* lisp/progmodes/perl-mode.el (perl-mode):
* lisp/progmodes/octave-inf.el (inferior-octave-mode):
* lisp/progmodes/autoconf.el (autoconf-mode):
* lisp/progmodes/m4-mode.el (m4-mode):
* lisp/progmodes/inf-lisp.el (inferior-lisp-mode):
* lisp/progmodes/idlwave.el (idlwave-mode):
* lisp/progmodes/icon.el (icon-mode):
* lisp/progmodes/idlw-help.el (idlwave-help-mode):
* lisp/progmodes/dcl-mode.el (dcl-mode):
* lisp/progmodes/idlw-shell.el (idlwave-shell-mode):
* lisp/progmodes/ebrowse.el (ebrowse-tree-mode, ebrowse-electric-list-mode)
(ebrowse-member-mode, ebrowse-electric-position-mode):
Use define-derived-mode.
* lisp/progmodes/xscheme.el (xscheme-start)
(local-set-scheme-interaction-buffer, scheme-interaction-mode):
* lisp/progmodes/which-func.el (which-function):
* lisp/progmodes/vhdl-mode.el (vhdl-set-style):
* lisp/progmodes/verilog-mode.el (verilog-set-compile-command)
(verilog-modify-compile-command, verilog-error-regexp-add-xemacs)
(verilog-set-define, verilog-auto-reeval-locals):
* lisp/progmodes/sql.el (sql-product-font-lock, sql-interactive-mode):
* lisp/progmodes/simula.el (simula-mode):
* lisp/progmodes/scheme.el (scheme-mode-variables, dsssl-mode):
* lisp/progmodes/python.el (python-check, python-mode):
* lisp/progmodes/prolog.el (prolog-mode-variables):
* lisp/progmodes/gud.el (gud-tooltip-activate-mouse-motions):
* lisp/progmodes/ebrowse.el (ebrowse-view-file-other-frame):
* lisp/progmodes/delphi.el (delphi-mode):
* lisp/progmodes/cc-styles.el (c-setup-paragraph-variables):
* lisp/progmodes/cc-mode.el (c-basic-common-init, c-common-init)
(c-font-lock-init): Move make-local-variable to their setq.
* lisp/progmodes/xscheme.el (exit-scheme-interaction-mode)
(xscheme-enter-interaction-mode, xscheme-enter-debugger-mode)
(xscheme-debugger-mode-p, xscheme-send-string-1):
* lisp/progmodes/tcl.el (inferior-tcl-proc, tcl-current-word)
(tcl-load-file, tcl-restart-with-file):
* lisp/progmodes/ps-mode.el (ps-run-running):
* lisp/progmodes/gdb-mi.el (gud-watch, gdb-mouse-set-clear-breakpoint):
* lisp/progmodes/js.el (js--get-all-known-symbols):
* lisp/progmodes/inf-lisp.el (inferior-lisp-proc):
* lisp/progmodes/idlwave.el (idlwave-beginning-of-statement)
(idlwave-template, idlwave-update-buffer-routine-info)
(idlwave-update-current-buffer-info)
(idlwave-get-routine-info-from-buffers, idlwave-choose)
(idlwave-scan-class-info, idlwave-fix-keywords)
(idlwave-list-buffer-load-path-shadows):
* lisp/progmodes/idlw-toolbar.el (idlwave-toolbar, idlwave-toolbar-add)
(idlwave-toolbar-remove):
* lisp/progmodes/idlw-shell.el (idlwave-shell-save-and-action)
(idlwave-shell-file-name, idlwave-shell-electric-debug-all-off)
(idlwave-shell-menu-def):
* lisp/progmodes/idlw-complete-structtag.el
(idlwave-prepare-structure-tag-completion):
* lisp/progmodes/gud.el (gud-set-buffer):
* lisp/progmodes/f90.el (f90-backslash-not-special):
* lisp/progmodes/delphi.el (delphi-find-unit): Use derived-mode-p.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 10 Dec 2010 15:00:25 -0500 |
parents | 646142bd4c38 |
children | 417b1e4d63cd |
rev | line source |
---|---|
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33020
diff
changeset
|
1 ;;; esh-test.el --- Eshell test suite |
29876 | 2 |
95619
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
106815 | 4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
29876 | 5 |
32526 | 6 ;; Author: John Wiegley <johnw@gnu.org> |
7 | |
29876 | 8 ;; This file is part of GNU Emacs. |
9 | |
94661
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
29876 | 11 ;; it under the terms of the GNU General Public License as published by |
94661
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; (at your option) any later version. |
29876 | 14 |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
94661
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
29876 | 22 |
23 ;;; Commentary: | |
24 | |
25 ;; The purpose of this module is to verify that Eshell works as | |
26 ;; expected. To run it on your system, use the command | |
27 ;; \\[eshell-test]. | |
28 | |
29 ;;; Code: | |
30 | |
87088
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
31 (eval-when-compile |
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
32 (require 'eshell) |
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
33 (require 'esh-util)) |
29876 | 34 (require 'esh-mode) |
35 | |
87088
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
36 (defgroup eshell-test nil |
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
37 "This module is meant to ensure that Eshell is working correctly." |
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
38 :tag "Eshell test suite" |
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
39 :group 'eshell) |
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
40 |
29876 | 41 ;;; User Variables: |
42 | |
63533
b7ea6515f1ba
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-431
Miles Bader <miles@gnu.org>
parents:
59120
diff
changeset
|
43 (defface eshell-test-ok |
29876 | 44 '((((class color) (background light)) (:foreground "Green" :bold t)) |
45 (((class color) (background dark)) (:foreground "Green" :bold t))) | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
108765
diff
changeset
|
46 "The face used to highlight OK result strings." |
29876 | 47 :group 'eshell-test) |
104783
ddf360111014
Mark face aliases with "-face" suffix as obsolete.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
48 (define-obsolete-face-alias 'eshell-test-ok-face 'eshell-test-ok "22.1") |
29876 | 49 |
63533
b7ea6515f1ba
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-431
Miles Bader <miles@gnu.org>
parents:
59120
diff
changeset
|
50 (defface eshell-test-failed |
29876 | 51 '((((class color) (background light)) (:foreground "OrangeRed" :bold t)) |
52 (((class color) (background dark)) (:foreground "OrangeRed" :bold t)) | |
53 (t (:bold t))) | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
108765
diff
changeset
|
54 "The face used to highlight FAILED result strings." |
29876 | 55 :group 'eshell-test) |
104783
ddf360111014
Mark face aliases with "-face" suffix as obsolete.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
56 (define-obsolete-face-alias 'eshell-test-failed-face 'eshell-test-failed "22.1") |
29876 | 57 |
58 (defcustom eshell-show-usage-metrics nil | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
108765
diff
changeset
|
59 "If non-nil, display different usage metrics for each Eshell command." |
29876 | 60 :set (lambda (symbol value) |
61 (if value | |
62 (add-hook 'eshell-mode-hook 'eshell-show-usage-metrics) | |
63 (remove-hook 'eshell-mode-hook 'eshell-show-usage-metrics)) | |
64 (set symbol value)) | |
65 :type '(choice (const :tag "No metrics" nil) | |
66 (const :tag "Cons cells consumed" t) | |
67 (const :tag "Time elapsed" 0)) | |
68 :group 'eshell-test) | |
69 | |
70 ;;; Code: | |
71 | |
95619
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
72 (defvar test-buffer) |
29876 | 73 |
74 (defun eshell-insert-command (text &optional func) | |
75 "Insert a command at the end of the buffer." | |
76 (goto-char eshell-last-output-end) | |
77 (insert-and-inherit text) | |
78 (funcall (or func 'eshell-send-input))) | |
79 | |
80 (defun eshell-match-result (regexp) | |
81 "Insert a command at the end of the buffer." | |
82 (goto-char eshell-last-input-end) | |
83 (looking-at regexp)) | |
84 | |
85 (defun eshell-command-result-p (text regexp &optional func) | |
86 "Insert a command at the end of the buffer." | |
87 (eshell-insert-command text func) | |
88 (eshell-match-result regexp)) | |
89 | |
90 (defvar eshell-test-failures nil) | |
91 | |
92 (defun eshell-run-test (module funcsym label command) | |
93 "Test whether FORM evaluates to a non-nil value." | |
94 (when (let ((sym (intern-soft (concat "eshell-" (symbol-name module))))) | |
95 (or (memq sym (eshell-subgroups 'eshell)) | |
96 (eshell-using-module sym))) | |
97 (with-current-buffer test-buffer | |
98 (insert-before-markers | |
99 (format "%-70s " (substring label 0 (min 70 (length label))))) | |
100 (insert-before-markers " ....") | |
101 (eshell-redisplay)) | |
102 (let ((truth (eval command))) | |
103 (with-current-buffer test-buffer | |
108765
d835100c3e8b
Replace Lisp calls to delete-backward-char by delete-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
104 (delete-char -6) |
29876 | 105 (insert-before-markers |
106 "[" (let (str) | |
107 (if truth | |
108 (progn | |
109 (setq str " OK ") | |
63533
b7ea6515f1ba
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-431
Miles Bader <miles@gnu.org>
parents:
59120
diff
changeset
|
110 (put-text-property 0 6 'face 'eshell-test-ok str)) |
29876 | 111 (setq str "FAILED") |
112 (setq eshell-test-failures (1+ eshell-test-failures)) | |
63533
b7ea6515f1ba
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-431
Miles Bader <miles@gnu.org>
parents:
59120
diff
changeset
|
113 (put-text-property 0 6 'face 'eshell-test-failed str)) |
29876 | 114 str) "]") |
115 (add-text-properties (line-beginning-position) (point) | |
116 (list 'test-func funcsym)) | |
117 (eshell-redisplay))))) | |
118 | |
119 (defun eshell-test-goto-func () | |
120 "Jump to the function that defines a particular test." | |
121 (interactive) | |
122 (let ((fsym (get-text-property (point) 'test-func))) | |
123 (when fsym | |
124 (let* ((def (symbol-function fsym)) | |
59120
b79ba69139eb
(eshell-test-goto-func): Call symbol-file with `defun'.
Richard M. Stallman <rms@gnu.org>
parents:
55581
diff
changeset
|
125 (library (locate-library (symbol-file fsym 'defun))) |
29876 | 126 (name (substring (symbol-name fsym) |
127 (length "eshell-test--"))) | |
128 (inhibit-redisplay t)) | |
129 (find-file library) | |
130 (goto-char (point-min)) | |
131 (re-search-forward (concat "^(eshell-deftest\\s-+\\w+\\s-+" | |
132 name)) | |
133 (beginning-of-line))))) | |
134 | |
135 (defun eshell-run-one-test (&optional arg) | |
136 "Jump to the function that defines a particular test." | |
137 (interactive "P") | |
138 (let ((fsym (get-text-property (point) 'test-func))) | |
139 (when fsym | |
140 (beginning-of-line) | |
141 (delete-region (point) (line-end-position)) | |
142 (let ((test-buffer (current-buffer))) | |
143 (set-buffer (let ((inhibit-redisplay t)) | |
144 (save-window-excursion (eshell t)))) | |
145 (funcall fsym) | |
146 (unless arg | |
147 (kill-buffer (current-buffer))))))) | |
148 | |
149 ;;;###autoload | |
150 (defun eshell-test (&optional arg) | |
151 "Test Eshell to verify that it works as expected." | |
152 (interactive "P") | |
111456
646142bd4c38
Replace some eshell functions that duplicate standard functions.
Glenn Morris <rgm@gnu.org>
parents:
110580
diff
changeset
|
153 (let* ((begin (float-time)) |
29876 | 154 (test-buffer (get-buffer-create "*eshell test*"))) |
155 (set-buffer (let ((inhibit-redisplay t)) | |
156 (save-window-excursion (eshell t)))) | |
157 (with-current-buffer test-buffer | |
158 (erase-buffer) | |
159 (setq major-mode 'eshell-test-mode) | |
160 (setq mode-name "EShell Test") | |
161 (set (make-local-variable 'eshell-test-failures) 0) | |
162 (local-set-key [(control ?c) (control ?c)] 'eshell-test-goto-func) | |
163 (local-set-key [(control ?c) (control ?r)] 'eshell-run-one-test) | |
164 (local-set-key [(control ?m)] 'eshell-test-goto-func) | |
165 (local-set-key [return] 'eshell-test-goto-func) | |
166 | |
55581
a9bcae5bca8e
2004-05-13 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
52401
diff
changeset
|
167 (insert "Testing Eshell under " (emacs-version)) |
29876 | 168 (switch-to-buffer test-buffer) |
169 (delete-other-windows)) | |
33020 | 170 (eshell-for funcname (sort (all-completions "eshell-test--" |
171 obarray 'functionp) | |
172 'string-lessp) | |
29876 | 173 (with-current-buffer test-buffer |
174 (insert "\n")) | |
175 (funcall (intern-soft funcname))) | |
176 (with-current-buffer test-buffer | |
177 (insert (format "\n\n--- %s --- (completed in %d seconds)\n" | |
178 (current-time-string) | |
111456
646142bd4c38
Replace some eshell functions that duplicate standard functions.
Glenn Morris <rgm@gnu.org>
parents:
110580
diff
changeset
|
179 (- (float-time) begin))) |
29876 | 180 (message "Eshell test suite completed: %s failure%s" |
181 (if (> eshell-test-failures 0) | |
182 (number-to-string eshell-test-failures) | |
183 "No") | |
184 (if (= eshell-test-failures 1) "" "s")))) | |
185 (goto-char eshell-last-output-end) | |
186 (unless arg | |
187 (kill-buffer (current-buffer)))) | |
188 | |
189 | |
190 (defvar eshell-metric-before-command 0) | |
191 (defvar eshell-metric-after-command 0) | |
192 | |
193 (defun eshell-show-usage-metrics () | |
194 "If run at Eshell mode startup, metrics are shown after each command." | |
195 (set (make-local-variable 'eshell-metric-before-command) | |
196 (if (eq eshell-show-usage-metrics t) | |
197 0 | |
198 (current-time))) | |
199 (set (make-local-variable 'eshell-metric-after-command) | |
200 (if (eq eshell-show-usage-metrics t) | |
201 0 | |
202 (current-time))) | |
203 | |
204 (add-hook 'eshell-pre-command-hook | |
205 (function | |
206 (lambda () | |
207 (setq eshell-metric-before-command | |
208 (if (eq eshell-show-usage-metrics t) | |
209 (car (memory-use-counts)) | |
210 (current-time))))) nil t) | |
211 | |
212 (add-hook 'eshell-post-command-hook | |
213 (function | |
214 (lambda () | |
215 (setq eshell-metric-after-command | |
216 (if (eq eshell-show-usage-metrics t) | |
217 (car (memory-use-counts)) | |
218 (current-time))) | |
219 (eshell-interactive-print | |
220 (concat | |
221 (int-to-string | |
222 (if (eq eshell-show-usage-metrics t) | |
223 (- eshell-metric-after-command | |
224 eshell-metric-before-command 7) | |
111456
646142bd4c38
Replace some eshell functions that duplicate standard functions.
Glenn Morris <rgm@gnu.org>
parents:
110580
diff
changeset
|
225 (- (float-time |
29876 | 226 eshell-metric-after-command) |
111456
646142bd4c38
Replace some eshell functions that duplicate standard functions.
Glenn Morris <rgm@gnu.org>
parents:
110580
diff
changeset
|
227 (float-time |
29876 | 228 eshell-metric-before-command)))) |
229 "\n")))) | |
230 nil t)) | |
231 | |
87088
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
232 (provide 'esh-test) |
ddc1d773fb48
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
233 |
29876 | 234 ;;; esh-test.el ends here |