From 6218588765f2baed11ca06805cf2c93f78d6e1f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Sat, 19 Jul 2025 17:02:28 +0200 Subject: [PATCH] ; silence some compiler warnings in tests * 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. (cherry picked from commit c184ea24414e4940783dfd4a594cb0898d560b6e) --- test/lisp/savehist-tests.el | 124 ++++++++++++++++++------------------ test/src/data-tests.el | 1 + 2 files changed, 64 insertions(+), 61 deletions(-) diff --git a/test/lisp/savehist-tests.el b/test/lisp/savehist-tests.el index 7e4437a75a9..ec4acbad453 100644 --- a/test/lisp/savehist-tests.el +++ b/test/lisp/savehist-tests.el @@ -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 diff --git a/test/src/data-tests.el b/test/src/data-tests.el index 75be9856463..1eaf1759c17 100644 --- a/test/src/data-tests.el +++ b/test/src/data-tests.el @@ -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)))) -- 2.39.5