Merge from origin/emacs-30

9c1d13c89a9 ; * admin/authors.el (authors-aliases): Add Vladimir Niki...
443df12eddc ; * INSTALL.REPO: Minor copyedits.
76b938fc1d2 ; Don't fail image tests if jpeg is supported via imagema...
f8ff9592be9 ; Skip autorevert test when notify support is missing
230ecb1e273 ; Skip shr-test/zoom-image test if png or libxml support ...
cc51bd56987 ; Skip image type test if support is missing

3 files changed, 14 insertions, 5 deletions

diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el
index 319f3285d2d..d8115b444de 100644
--- a/test/lisp/autorevert-tests.el
+++ b/test/lisp/autorevert-tests.el
@@ -581,6 +581,8 @@ This expects `auto-revert--messages' to be bound by
 ;; This is inspired by Bug#44638, Bug#71424.
 (ert-deftest auto-revert-test07-auto-revert-several-buffers ()
   "Check autorevert for several buffers visiting the same file."
+  (skip-unless (or file-notify--library
+                   (file-remote-p temporary-file-directory)))
   ;; (with-auto-revert-test
   (ert-with-temp-file tmpfile
     (let ((auto-revert-use-notify t)
diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el
index 69557c83657..455118cb98c 100644
--- a/test/lisp/image-tests.el
+++ b/test/lisp/image-tests.el
@@ -80,14 +80,20 @@
   (should (eq (image-supported-file-p "foo.pbm") 'pbm)))
 
 (ert-deftest image-supported-file-p/optional ()
-  (if (image-type-available-p 'jpeg)
-      (should (eq (image-supported-file-p "foo.jpg") 'jpeg))
-    (should-not (image-supported-file-p "foo.jpg"))))
+  (cond ((image-type-available-p 'jpeg)
+         (should (eq (image-supported-file-p "foo.jpg") 'jpeg)))
+        ((fboundp 'imagemagick-types)
+         (should (eq (image-supported-file-p "foo.jpg") 'imagemagick)))
+        (nil
+         (should-not (image-supported-file-p "foo.jpg")))))
 
 (ert-deftest image-supported-file-p/unsupported-returns-nil ()
   (should-not (image-supported-file-p "foo.some-unsupported-format")))
 
 (ert-deftest image-type-from-file-name ()
+  (skip-unless (and (image-type-available-p 'jpeg)
+                    (image-type-available-p 'png)
+                    (image-type-available-p 'webp)))
   (with-suppressed-warnings ((obsolete image-type-from-file-name))
     (should (eq (image-type-from-file-name "foo.jpg") 'jpeg))
     (should (eq (image-type-from-file-name "foo.png") 'png))
diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el
index 4c2fdf0cc70..363cd144e8f 100644
--- a/test/lisp/net/shr-tests.el
+++ b/test/lisp/net/shr-tests.el
@@ -135,8 +135,9 @@ settings, then once more for each (OPTION . VALUE) pair.")
 
 (ert-deftest shr-test/zoom-image ()
   "Test that `shr-zoom-image' properly replaces the original image."
-  (skip-unless (bound-and-true-p image-types))
-  (skip-unless (libxml-available-p))
+  (skip-unless (and (bound-and-true-p image-types)
+                    (image-type-available-p 'png)
+                    (fboundp 'libxml-parse-html-region)))
   (let* ((image (expand-file-name "data/image/blank-100x200.png"
                                   (getenv "EMACS_TEST_DIRECTORY")))
          (image-url (concat "file://" (if (string-prefix-p "/" image)