Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

; silence some compiler warnings in tests

Browse source 
* test/lisp/savehist-tests.el (savehist-test-saved-variables):
(savehist-test-duplicated-saved-symbols):
* test/src/data-tests.el (binding-test-toplevel-values):
Suppress harmless warnings.
This commit is contained in:
Mattias Engdegård 2025-07-19 17:02:28 +02:00
parent f4a9673f61
commit c184ea2441
2 changed files with 64 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
test/lisp/savehist-tests.el
View file

@ -35,72 +35,74 @@
(defvar savehist-tests--t1)
(defvar savehist-tests--t2)
(ert-with-temp-file tmpfile
(let* ((savehist-file tmpfile)
(savehist-save-minibuffer-history t)
(savehist-save-hook)
(savehist-loaded)
(savehist-minibuffer-history-variables)
(savehist-additional-variables '(savehist-tests--t2))
(savehist-ignored-variables '(t3))
(savehist-tests--t1 '("t1-value"))
(savehist-tests--t2 '("t2-value"))
(t3 '("t3-value"))
(t1-copy (copy-tree savehist-tests--t1))
(t2-copy (copy-tree savehist-tests--t2))
(_t3-copy (copy-tree t3))
(save-var (lambda (x)
(let ((minibuffer-history-variable x))
(savehist-minibuffer-hook)))))
(savehist-mode)
(funcall save-var 'savehist-tests--t1)
(funcall save-var 'savehist-tests--t2)
(funcall save-var 't3) ; should be ignored
(savehist-save)
(setq savehist-tests--t1 nil savehist-tests--t2 nil t3 nil)
(progn
;; Force reloading the file.
(savehist-mode -1)
(setq savehist-loaded nil)
(savehist-mode))
(should (equal savehist-tests--t1 t1-copy))
(should (equal savehist-tests--t2 t2-copy))
(should (equal t3 nil)))))
(with-suppressed-warnings ((obsolete savehist-loaded))
(let* ((savehist-file tmpfile)
(savehist-save-minibuffer-history t)
(savehist-save-hook)
(savehist-loaded)
(savehist-minibuffer-history-variables)
(savehist-additional-variables '(savehist-tests--t2))
(savehist-ignored-variables '(t3))
(savehist-tests--t1 '("t1-value"))
(savehist-tests--t2 '("t2-value"))
(t3 '("t3-value"))
(t1-copy (copy-tree savehist-tests--t1))
(t2-copy (copy-tree savehist-tests--t2))
(_t3-copy (copy-tree t3))
(save-var (lambda (x)
(let ((minibuffer-history-variable x))
(savehist-minibuffer-hook)))))
(savehist-mode)
(funcall save-var 'savehist-tests--t1)
(funcall save-var 'savehist-tests--t2)
(funcall save-var 't3) ; should be ignored
(savehist-save)
(setq savehist-tests--t1 nil savehist-tests--t2 nil t3 nil)
(progn
;; Force reloading the file.
(savehist-mode -1)
(setq savehist-loaded nil)
(savehist-mode))
(should (equal savehist-tests--t1 t1-copy))
(should (equal savehist-tests--t2 t2-copy))
(should (equal t3 nil))))))
(ert-deftest savehist-test-duplicated-saved-symbols ()
(defvar savehist-tests--t1)
(defvar savehist-tests--t2)
(ert-with-temp-file tmpfile
(let* ((savehist-file tmpfile)
(savehist-save-minibuffer-history t)
(savehist-save-hook)
(savehist-loaded)
;; Will be '(savehist-tests--t2 savehist-tests--t1)
(savehist-minibuffer-history-variables)
;; `savehist-tests--t2' should not be saved twice.
(savehist-additional-variables '(savehist-tests--t2))
(savehist-tests--t1 '("t1-value"))
(savehist-tests--t2 '("t2-value"))
(save-var (lambda (x)
(let ((minibuffer-history-variable x))
(savehist-minibuffer-hook)))))
(savehist-mode)
(funcall save-var 'savehist-tests--t1)
(funcall save-var 'savehist-tests--t2)
(savehist-save)
(progn
;; Force reloading the file.
(savehist-mode -1)
(setq savehist-loaded nil)
(savehist-mode))
(let ((saved-variables))
(with-temp-buffer
(insert-file-contents tmpfile)
(goto-char 1)
;; alnum bypasses savehist-minibuffer-history-variables
(while (re-search-forward "(setq \\([[:alnum:]]+\\) " nil t 1)
(push (match-string 1) saved-variables)))
(should (= (length saved-variables)
(length (seq-uniq saved-variables #'equal))))))))
(with-suppressed-warnings ((obsolete savehist-loaded))
(let* ((savehist-file tmpfile)
(savehist-save-minibuffer-history t)
(savehist-save-hook)
(savehist-loaded)
;; Will be '(savehist-tests--t2 savehist-tests--t1)
(savehist-minibuffer-history-variables)
;; `savehist-tests--t2' should not be saved twice.
(savehist-additional-variables '(savehist-tests--t2))
(savehist-tests--t1 '("t1-value"))
(savehist-tests--t2 '("t2-value"))
(save-var (lambda (x)
(let ((minibuffer-history-variable x))
(savehist-minibuffer-hook)))))
(savehist-mode)
(funcall save-var 'savehist-tests--t1)
(funcall save-var 'savehist-tests--t2)
(savehist-save)
(progn
;; Force reloading the file.
(savehist-mode -1)
(setq savehist-loaded nil)
(savehist-mode))
(let ((saved-variables))
(with-temp-buffer
(insert-file-contents tmpfile)
(goto-char 1)
;; alnum bypasses savehist-minibuffer-history-variables
(while (re-search-forward "(setq \\([[:alnum:]]+\\) " nil t 1)
(push (match-string 1) saved-variables)))
(should (= (length saved-variables)
(length (seq-uniq saved-variables #'equal)))))))))
(provide 'savehist-tests)
;;; savehist-tests.el ends here

1
test/src/data-tests.el
View file

@ -421,6 +421,7 @@ comparing the subr with a much slower Lisp implementation."
(should (eq c-e-l 'bar))
(should (eq (default-toplevel-value 'c-e-l) 'baz))))
(let ((c-e-u 'foo))
(ignore c-e-u) ; hush unused-variable warning
(should (condition-case _
(default-toplevel-value 'c-e-u)
(void-variable t))))