From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 12 Sep 2022 13:14:42 +0000 (+0200)
Subject: Skip manual GIF metadata test on MS-Windows
X-Git-Tag: emacs-29.0.90~1856^2~585
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82530902931416603340feb32cb186173ec2d46d;p=emacs.git

Skip manual GIF metadata test on MS-Windows

* test/manual/image-tests.el
(image-skip-unless): Add new arg CONDITION.
(image-tests-image-metadata/gif): Skip test on MS-Windows when
using native image API.  (Bug#57691)
---

diff --git a/test/manual/image-tests.el b/test/manual/image-tests.el
index c66080cf029..f867047d08e 100644
--- a/test/manual/image-tests.el
+++ b/test/manual/image-tests.el
@@ -31,9 +31,10 @@
 
 ;;; Code:
 
-(defmacro image-skip-unless (format)
-  `(skip-unless (and (display-images-p)
-                     (image-type-available-p ,format))))
+(defmacro image-skip-unless (format &rest condition)
+  `(skip-unless (or (and (display-images-p)
+                         (image-type-available-p ,format))
+                    ,@condition)))
 
 (defconst image-tests--images
   `((gif . ,(expand-file-name "test/data/image/black.gif"
@@ -221,7 +222,7 @@
 ;;       contain metadata.
 
 (ert-deftest image-tests-image-metadata/gif ()
-  (image-skip-unless 'gif)
+  (image-skip-unless 'gif (not w32-use-native-image-API))
   (should (memq 'delay
                 (image-metadata
                  (create-image (cdr (assq 'gif image-tests--images)))))))