From: Glenn Morris <rgm@gnu.org>
Date: Tue, 18 Apr 2017 16:52:33 +0000 (-0400)
Subject: Avoid ert test failures
X-Git-Tag: emacs-26.0.90~521^2~601
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=491531b20d05a0f2cc747aa01e697a764c34a99d;p=emacs.git

Avoid ert test failures

* lisp/emacs-lisp/ert.el (ert--expand-should-1):
Avoid errors related to undefined byte-compile-macro-environment.
Somehow masked until very recently because loading seq (eg)
loads bytecomp.  http://hydra.nixos.org/build/51730765
---

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 7eaf33a27dc..f4c61e625d8 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -275,6 +275,7 @@ DATA is displayed to the user and should state the reason for skipping."
 
 (defun ert--expand-should-1 (whole form inner-expander)
   "Helper function for the `should' macro and its variants."
+  (require 'bytecomp)                   ; FIXME?
   (let ((form
          (macroexpand form (append byte-compile-macro-environment
                                    (cond