Merge from savannah/emacs-30

6f9f9a2155 Fix two tests for --without-all build
This commit is contained in:
Po Lu 2024-06-28 14:46:53 +08:00
commit 5c09557df3

View file

@ -49,11 +49,11 @@
(ert-deftest image-tests-image-mask-p/error-on-nongraphical-display ()
(skip-when (display-images-p))
(should-error (image-mask-p (cdr (assq 'xpm image-tests--images)))))
(should-error (image-mask-p (cdr (assq 'xbm image-tests--images)))))
(ert-deftest image-tests-image-metadata/error-on-nongraphical-display ()
(skip-when (display-images-p))
(should-error (image-metadata (cdr (assq 'xpm image-tests--images)))))
(should-error (image-metadata (cdr (assq 'xbm image-tests--images)))))
(ert-deftest image-tests-imagemagick-types ()
(skip-unless (fboundp 'imagemagick-types))