aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-07-11 09:01:26 -0700
committerGlenn Morris2013-07-11 09:01:26 -0700
commit03d019811522c5d98b3359e48b5cf4d5cc9b72e5 (patch)
tree8da662dc7f7d7235d30b7246ccbe5698cdefffe9
parent709c6d2b1cdb80fc3a33a8493c01ba32a9eb3b42 (diff)
downloademacs-03d019811522c5d98b3359e48b5cf4d5cc9b72e5.tar.gz
emacs-03d019811522c5d98b3359e48b5cf4d5cc9b72e5.zip
Silence package-test.el compilation
* test/automated/package-test.el (makeinfo-buffer): Autoload. (compilation-in-progress, tar-parse-info, tar-header-name): Declare. (package-test-install-texinfo): Don't require makeinfo.
-rw-r--r--test/ChangeLog4
-rwxr-xr-xtest/automated/package-test.el7
2 files changed, 10 insertions, 1 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 1df70aecc66..5d51a8b7e98 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,5 +1,9 @@
12013-07-11 Glenn Morris <rgm@gnu.org> 12013-07-11 Glenn Morris <rgm@gnu.org>
2 2
3 * automated/package-test.el (makeinfo-buffer): Autoload.
4 (compilation-in-progress, tar-parse-info, tar-header-name): Declare.
5 (package-test-install-texinfo): Don't require makeinfo.
6
3 * automated/files.el: Stop "local variables" confusion. 7 * automated/files.el: Stop "local variables" confusion.
4 8
5 * automated/flymake-tests.el (flymake-tests): Remove unused group. 9 * automated/flymake-tests.el (flymake-tests): Remove unused group.
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index 706ba953d98..a5f0ebb1f94 100755
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -142,6 +142,9 @@
142 (let ((help-xref-following t)) 142 (let ((help-xref-following t))
143 ,@body))) 143 ,@body)))
144 144
145(autoload 'makeinfo-buffer "makeinfo")
146(defvar compilation-in-progress)
147
145(defun package-test-install-texinfo (file) 148(defun package-test-install-texinfo (file)
146 "Install from texinfo FILE. 149 "Install from texinfo FILE.
147 150
@@ -156,7 +159,6 @@ FILE should be a .texinfo file relative to the current
156 (with-current-buffer (find-file-literally full-file) 159 (with-current-buffer (find-file-literally full-file)
157 (unwind-protect 160 (unwind-protect
158 (progn 161 (progn
159 (require 'makeinfo)
160 (makeinfo-buffer) 162 (makeinfo-buffer)
161 ;; Give `makeinfo-buffer' a chance to finish 163 ;; Give `makeinfo-buffer' a chance to finish
162 (while compilation-in-progress 164 (while compilation-in-progress
@@ -184,6 +186,9 @@ DIR is the base name of the package directory, without the trailing slash"
184 (dolist (file (package-test-suffix-matches dir package-test-built-file-suffixes)) 186 (dolist (file (package-test-suffix-matches dir package-test-built-file-suffixes))
185 (delete-file file)))) 187 (delete-file file))))
186 188
189(defvar tar-parse-info)
190(declare-function tar-header-name "tar-mode" (cl-x) t) ; defstruct
191
187(defun package-test-search-tar-file (filename) 192(defun package-test-search-tar-file (filename)
188 "Search the current buffer's `tar-parse-info' variable for FILENAME. 193 "Search the current buffer's `tar-parse-info' variable for FILENAME.
189 194