Commit 95a04fd2 authored by Noam Postavsky's avatar Noam Postavsky
Browse files

; Avoid test failures when running from compiled test files

* test/lisp/dom-tests.el: Require `subr-x' during runtime as well.
* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-defstruct-record):
* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
(eieio-test-23-inheritance-check, eieio-test-25-slot-tests): Mark as
expected to fail when byte-compiled.
parent 054c198c
......@@ -26,7 +26,10 @@
(require 'dom)
(require 'ert)
(eval-when-compile (require 'subr-x))
;; `defsubst's are not inlined inside `ert-deftest' (see Bug#24402),
;; therefore we can't use `eval-when-compile' here.
(require 'subr-x)
(defun dom-tests--tree ()
"Return a DOM tree for testing."
......
......@@ -518,7 +518,15 @@
(ert-deftest cl-lib-symbol-macrolet-2 ()
(should (equal (cl-lib-symbol-macrolet-4+5) (+ 4 5))))
(defun cl-lib-tests--dummy-function ()
;; Dummy function to see if the file is compiled.
t)
(ert-deftest cl-lib-defstruct-record ()
;; This test fails when compiled, see Bug#24402/27718.
:expected-result (if (byte-code-function-p
(symbol-function 'cl-lib-tests--dummy-function))
:failed :passed)
(cl-defstruct foo x)
(let ((x (make-foo :x 42)))
(should (recordp x))
......
......@@ -529,7 +529,15 @@ METHOD is the method that was attempting to be called."
"This class should break."))
:type 'invalid-slot-type))
(defun eieio-tests--dummy-function ()
;; Dummy function to see if the file is compiled.
t)
(ert-deftest eieio-test-23-inheritance-check ()
;; This test fails when compiled, see Bug#27718.
:expected-result (if (byte-code-function-p
(symbol-function 'eieio-tests--dummy-function))
:failed :passed)
(should (child-of-class-p 'class-ab 'class-a))
(should (child-of-class-p 'class-ab 'class-b))
(should (object-of-class-p eitest-a 'class-a))
......@@ -548,6 +556,10 @@ METHOD is the method that was attempting to be called."
(should (not (cl-typep "foo" 'class-a))))
(ert-deftest eieio-test-24-object-predicates ()
;; This test fails when compiled, see Bug#27718.
:expected-result (if (byte-code-function-p
(symbol-function 'eieio-tests--dummy-function))
:failed :passed)
(let ((listooa (list (class-ab) (class-a)))
(listoob (list (class-ab) (class-b))))
(should (cl-typep listooa '(list-of class-a)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment