From 32a764e106cb6ffbf5f596478d8318e256db58d7 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 21 Dec 2021 18:01:23 +0100 Subject: Fix some tests in --without-all builds * test/lisp/image-tests.el (image-type/from-filename): * test/src/image-tests.el (image-tests-init-image-library): * test/src/thread-tests.el (threads-test-bug33073): Fix tests in --without-all builds. --- test/lisp/image-tests.el | 3 ++- test/src/image-tests.el | 1 - test/src/thread-tests.el | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el index 79b0014f60a..47d321d5b53 100644 --- a/test/lisp/image-tests.el +++ b/test/lisp/image-tests.el @@ -82,7 +82,8 @@ (ert-deftest image-type/from-filename () ;; On emba, `image-types' and `image-load-path' do not exist. (skip-unless (and (bound-and-true-p image-types) - (bound-and-true-p image-load-path))) + (bound-and-true-p image-load-path) + (image-type-available-p 'jpeg))) (should (eq (image-type "foo.jpg") 'jpeg))) (defun image-tests--type-from-file-header (type) diff --git a/test/src/image-tests.el b/test/src/image-tests.el index 2b236086b6f..e54d0df71f1 100644 --- a/test/src/image-tests.el +++ b/test/src/image-tests.el @@ -239,7 +239,6 @@ (ert-deftest image-tests-init-image-library () (skip-unless (fboundp 'init-image-library)) (should (init-image-library 'pbm)) ; built-in - (should (init-image-library 'xpm)) ; built-in (should-not (init-image-library 'invalid-image-type))) ;;; image-tests.el ends here diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el index 52eace7e9d2..f1a8baedadd 100644 --- a/test/src/thread-tests.el +++ b/test/src/thread-tests.el @@ -389,6 +389,7 @@ (should (equal (thread-last-error) '(error "Die, die, die!"))))) (ert-deftest threads-test-bug33073 () + (skip-unless (fboundp 'make-thread)) (let ((th (make-thread 'ignore))) (should-not (equal th main-thread)))) -- cgit v1.2.3