annotate tests/automated/os-tests.el @ 4539:061e030e3270

Fix some bugs in load-history construction, built-in symbol file names. lib-src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * make-docfile.c (main): Allow more than one -d argument, followed by a directory to change to. (put_filename): Don't strip directory information; with previous change, allows retrieval of Lisp function and variable origin files from #'built-in-symbol-file relative to lisp-directory. (scan_lisp_file): Don't add an extraneous newline after the file name, put_filename has added the newline already. lisp/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * loadup.el (load-history): Add the contents of current-load-list to load-history before clearing it. Move the variable declarations earlier in the file to a format understood by make-docfile.c. * custom.el (custom-declare-variable): Add the variable's symbol to the current file's load history entry correctly, don't use a cons. Eliminate a comment that we don't need to worry about, we don't need to check the `initialized' C variable in Lisp. * bytecomp.el (byte-compile-output-file-form): Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here; treat #'custom-declare-variable correctly, generating the docstrings in a format understood by make-docfile.c. * loadhist.el (symbol-file): Correct behaviour for checking autoloaded macros and functions when supplied with a TYPE argument. Accept fully-qualified paths from #'built-in-symbol-file; if a path is not fully-qualified, return it relative to lisp-directory if the filename corresponds to a Lisp file, and relative to (concat source-directory "/src/") otherwise. * make-docfile.el (preloaded-file-list): Rationalise some let bindings a little. Use the "-d" argument to make-docfile.c to supply Lisp paths relative to lisp-directory, not absolutely. Add in loadup.el explicitly to the list of files to be processed by make-docfile.c--it doesn't make sense to add it to preloaded-file-list, since that is used for purposes of byte-compilation too. src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * doc.c (Fbuilt_in_symbol_file): Return a subr's filename immediately if we've found it. Check for compiled function and compiled macro docstrings in DOC too, and return them if they exist. The branch of the if statement focused on functions may have executed, but we may still want to check variable bindings; an else clause isn't appropriate.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 27 Dec 2008 14:05:50 +0000
parents 3660d327399f
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2356
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
1 ;;; os-tests.el --- test support for OS interaction
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
2
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
3 ;; Copyright (C) 2004 Free Software Foundation
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
4
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
5 ;; Author: Stephen J. Turnbull <stephen@xemacs.org>
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
6 ;; Maintainer: Stephen J. Turnbull <stephen@xemacs.org>
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
7 ;; Created: 2004 October 28
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
8 ;; Keywords: tests, process support
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
9
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
10 ;; This file is part of XEmacs.
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
11
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
12 ;; XEmacs is free software; you can redistribute it and/or modify it
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
13 ;; under the terms of the GNU General Public License as published by
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
14 ;; the Free Software Foundation; either version 2, or (at your option)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
15 ;; any later version.
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
16
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
17 ;; XEmacs is distributed in the hope that it will be useful, but
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
20 ;; General Public License for more details.
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
21
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
23 ;; along with XEmacs; see the file COPYING. If not, write to the Free
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
24 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
25 ;; 02111-1307, USA.
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
26
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
27 ;;; Synched up with: Not in FSF.
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
28
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
29 ;;; Commentary:
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
30
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
31 ;; Test OS support. Processes, environment variables, etc.
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
32 ;; See test-harness.el for instructions on how to run these tests.
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
33
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
34 ;; call-process-region bug reported by Katsumi Yamaoka on 2004-10-26
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
35 ;; in <b9yvfcyuscf.fsf@jpl.org>, who suggested the basic test scheme
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
36 ;; in <b9yoeipvwn0.fsf@jpl.org>.
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
37
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
38 ;; tac works by lines, unfortunately
4199
3660d327399f [xemacs-hg @ 2007-10-01 08:07:39 by stephent]
stephent
parents: 2356
diff changeset
39 ;; #### The contortions around `executable-find' gag me, but I don't have time
3660d327399f [xemacs-hg @ 2007-10-01 08:07:39 by stephent]
stephent
parents: 2356
diff changeset
40 ;; to deal today. If we have `executable-find', we should use its value!
2356
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
41 (let* ((original-string "a\nb\nc\nd\n")
4199
3660d327399f [xemacs-hg @ 2007-10-01 08:07:39 by stephent]
stephent
parents: 2356
diff changeset
42 ;; `executable-find' is in a package and may be unavailable.
3660d327399f [xemacs-hg @ 2007-10-01 08:07:39 by stephent]
stephent
parents: 2356
diff changeset
43 (tac-cases (if (and (fboundp 'executable-find) (executable-find "tac"))
2356
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
44 '((1 . "c\nb\na\nd\n")
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
45 (3 . "a\nc\nb\nd\n")
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
46 (5 . "a\nc\nb\nd\n")
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
47 (7 . "a\nc\nb\nd\n")
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
48 (9 . "a\nd\nc\nb\n"))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
49 nil))
4199
3660d327399f [xemacs-hg @ 2007-10-01 08:07:39 by stephent]
stephent
parents: 2356
diff changeset
50 (cat-cases (if (and (fboundp 'executable-find) (executable-find "cat"))
2356
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
51 '((1 . "b\nc\na\nd\n")
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
52 (3 . "a\nb\nc\nd\n")
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
53 (5 . "a\nb\nc\nd\n")
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
54 (7 . "a\nb\nc\nd\n")
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
55 (9 . "a\nd\nb\nc\n"))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
56 nil))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
57 cases case)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
58 (with-temp-buffer
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
59 (Skip-Test-Unless tac-cases
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
60 "tac executable not found"
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
61 "Tests of call-process-region with region deleted after inserting
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
62 tac process output."
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
63 (setq cases tac-cases)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
64 (while cases
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
65 (setq case (car cases)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
66 cases (cdr cases))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
67 (flet ((do-test (pos result)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
68 (erase-buffer)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
69 (insert original-string)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
70 (goto-char pos)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
71 (call-process-region 3 7 "tac" t t)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
72 (goto-char (point-min))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
73 (Assert (looking-at result))))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
74 (do-test (car case) (cdr case)))))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
75 ;; if you're in that much of a hurry you can blow cat off
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
76 ;; if you've done tac, but I'm not going to bother
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
77 (Skip-Test-Unless cat-cases
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
78 "cat executable not found"
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
79 "Tests of call-process-region with region deleted after inserting
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
80 cat process output."
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
81 (setq cases cat-cases)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
82 (while cases
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
83 (setq case (car cases)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
84 cases (cdr cases))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
85 (flet ((do-test (pos result)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
86 (erase-buffer)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
87 (insert original-string)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
88 (goto-char pos)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
89 (call-process-region 3 7 "cat" t t)
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
90 (goto-char (point-min))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
91 (Assert (looking-at result))))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
92 (do-test (car case) (cdr case)))))))
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
93
0b060ef35789 [xemacs-hg @ 2004-10-28 11:31:09 by stephent]
stephent
parents:
diff changeset
94 ;;; end of os-tests.el