diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-04-15 12:44:48 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-04-15 12:44:48 -0400 |
| commit | 709d55804798254b9b431ceac2e65d255fe031d5 (patch) | |
| tree | 8f02e888c025ba5adf68e65f44a9281800184eb8 /test | |
| parent | 0fe7fef54bb93fe02bf7313cfe65c4b6b455a785 (diff) | |
| parent | c62afb10cf0bbeae6a540f4e05b7a23536636cd0 (diff) | |
| download | emacs-709d55804798254b9b431ceac2e65d255fe031d5.tar.gz | |
Merge from origin/emacs-29
c62afb10cf0 Fix wallpaper-tests on MS-Windows
f2d212c6966 Fix a couple of eglot-tests
338b3718b6c Fix visiting RPM files
b4afee03193 Fix ff-quiet-mode doc
2445100d7d6 ; Improve documentation of 'match-buffers'
d4d0da96f0b ; Update make-tarball.txt for Emacs 29.
9b0bf694da4 ; Fix ldefs-boot.el.
0cb86a348c7 ; Update ChangeLog.4.
# Conflicts:
# ChangeLog.4
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/image/wallpaper-tests.el | 21 | ||||
| -rw-r--r-- | test/lisp/progmodes/eglot-tests.el | 1 |
2 files changed, 15 insertions, 7 deletions
diff --git a/test/lisp/image/wallpaper-tests.el b/test/lisp/image/wallpaper-tests.el index 94b4d8b2dbb..2e4e36030d4 100644 --- a/test/lisp/image/wallpaper-tests.el +++ b/test/lisp/image/wallpaper-tests.el @@ -24,7 +24,8 @@ (require 'wallpaper) (ert-deftest wallpaper--find-setter () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (let (wallpaper--current-setter (wallpaper--default-setters (wallpaper--default-methods-create @@ -32,7 +33,8 @@ (should (wallpaper--find-setter)))) (ert-deftest wallpaper--find-setter/call-predicate () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (let* ( wallpaper--current-setter called (wallpaper--default-setters (wallpaper--default-methods-create @@ -43,7 +45,8 @@ (should called))) (ert-deftest wallpaper--find-setter/set-current-setter () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (let (wallpaper--current-setter (wallpaper--default-setters (wallpaper--default-methods-create @@ -52,7 +55,8 @@ (should wallpaper--current-setter))) (ert-deftest wallpaper-set/runs-command () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (ert-with-temp-file fil-jpg :suffix ".jpg" (ert-with-temp-file fil @@ -70,7 +74,8 @@ (should (file-exists-p fil))))))) (ert-deftest wallpaper-set/runs-command/detach () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (ert-with-temp-file fil-jpg :suffix ".jpg" (ert-with-temp-file fil @@ -89,7 +94,8 @@ (should (file-exists-p fil)))))) (ert-deftest wallpaper-set/calls-init-action () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (ert-with-temp-file fil-jpg :suffix ".jpg" (ert-with-temp-file fil @@ -108,7 +114,8 @@ (should called))))) (ert-deftest wallpaper-set/calls-wallpaper-set-function () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (ert-with-temp-file fil-jpg :suffix ".jpg" (let* ( wallpaper--current-setter called diff --git a/test/lisp/progmodes/eglot-tests.el b/test/lisp/progmodes/eglot-tests.el index d96ba2ebf07..518f8810bdf 100644 --- a/test/lisp/progmodes/eglot-tests.el +++ b/test/lisp/progmodes/eglot-tests.el @@ -804,6 +804,7 @@ int main() { (ert-deftest eglot-test-json-basic () "Test basic autocompletion in vscode-json-languageserver." (skip-unless (executable-find "vscode-json-languageserver")) + (skip-unless (fboundp 'yas-minor-mode)) (eglot--with-fixture '(("project" . (("p.json" . "{\"foo.b") |