Don't fail image-tests if JPEG format isn't compiled in

* test/lisp/image-tests.el (image-type/from-filename):
Make jpeg test conditional.  Test pbm (always present).

diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el
index 2f7afa2f38ebe2f5b88108a21f003a91a736250e..317e85fe50c478611e6b739a8fc3a7b3a8d6094e 100644 (file)
--- a/test/lisp/image-tests.el
+++ b/test/lisp/image-tests.el
@@ -59,7 +59,9 @@
 (ert-deftest image-type/from-filename ()
   ;; On emba, `image-load-path' does not exist.
   (skip-unless (bound-and-true-p image-load-path))
-  (should (eq (image-type "foo.jpg") 'jpeg)))
+  (should (eq (image-type "gif.pbm") 'pbm))
+  (when (memq 'jpeg image-types)        ; jpeg may not be compiled in
+    (should (eq (image-type "foo.jpg") 'jpeg))))
 
 (ert-deftest image-type-from-file-header-test ()
   "Test image-type-from-file-header."