summaryrefslogtreecommitdiff
path: root/test/lisp/dom-tests.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2017-07-16 19:12:10 -0400
committerNoam Postavsky <npostavs@gmail.com>2017-08-07 18:43:55 -0400
commit95a04fd26c91e6c6c9191a629d26886f136e30fc (patch)
tree2ac918b82a0b22d7719cae4f63cd1e2bf2d0e7e2 /test/lisp/dom-tests.el
parent054c198c120c1f01a8ff753892d52710b740acc6 (diff)
downloademacs-95a04fd26c91e6c6c9191a629d26886f136e30fc.tar.gz
; 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.
Diffstat (limited to 'test/lisp/dom-tests.el')
-rw-r--r--test/lisp/dom-tests.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/lisp/dom-tests.el b/test/lisp/dom-tests.el
index 32d231a47e5..24d4b932452 100644
--- a/test/lisp/dom-tests.el
+++ b/test/lisp/dom-tests.el
@@ -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."