2 files changed, 57 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 942455ad22b..4003a24bc6b 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,5 +1,12 @@
 2014-04-21  Daniel Colascione  <dancol@dancol.org>
 
+        * automated/bytecomp-tests.el (test-byte-comp-compile-and-load):
+        New function.
+        (test-byte-comp-macro-expansion)
+        (test-byte-comp-macro-expansion-eval-and-compile)
+        (test-byte-comp-macro-expansion-eval-when-compile)
+        (test-byte-comp-macro-expand-lexical-override): New tests.
+
         * automated/cl-lib.el (cl-loop-destructuring-with): New test.
         (cl-the): Fix cl-the test.
 
diff --git a/test/automated/bytecomp-tests.el b/test/automated/bytecomp-tests.el
index 0a9a301dd0d..e61c7c3a41d 100644
--- a/test/automated/bytecomp-tests.el
+++ b/test/automated/bytecomp-tests.el
@@ -305,6 +305,56 @@ Subtests signal errors if something goes wrong."
                             'face fail-face)))
       (insert "\n"))))
 
+(defun test-byte-comp-compile-and-load (&rest forms)
+  (let ((elfile nil)
+        (elcfile nil))
+    (unwind-protect
+         (progn
+           (setf elfile (make-temp-file "test-bytecomp" nil ".el"))
+           (setf elcfile (make-temp-file "test-bytecomp" nil ".elc"))
+           (with-temp-buffer
+             (dolist (form forms)
+               (print form (current-buffer)))
+             (write-region (point-min) (point-max) elfile))
+           (let ((byte-compile-dest-file elcfile))
+             (byte-compile-file elfile t)))
+      (when elfile (delete-file elfile))
+      (when elcfile (delete-file elcfile)))))
+(put 'test-byte-comp-compile-and-load 'lisp-indent-function 0)
+
+(ert-deftest test-byte-comp-macro-expansion ()
+  (test-byte-comp-compile-and-load
+    '(progn (defmacro abc (arg) 1) (defun def () (abc 2))))
+  (should (equal (funcall 'def) 1)))
+
+(ert-deftest test-byte-comp-macro-expansion-eval-and-compile ()
+  (test-byte-comp-compile-and-load
+    '(eval-and-compile (defmacro abc (arg) -1) (defun def () (abc 2))))
+  (should (equal (funcall 'def) -1)))
+
+(ert-deftest test-byte-comp-macro-expansion-eval-when-compile ()
+  ;; Make sure we interpret eval-when-compile forms properly.  CLISP
+  ;; and SBCL interpreter eval-when-compile (well, the CL equivalent)
+  ;; in the same way.
+  (test-byte-comp-compile-and-load
+    '(eval-when-compile
+      (defmacro abc (arg) -10)
+      (defun abc-1 () (abc 2)))
+    '(defmacro abc-2 () (abc-1))
+    '(defun def () (abc-2)))
+  (should (equal (funcall 'def) -10)))
+
+(ert-deftest test-byte-comp-macro-expand-lexical-override ()
+  ;; Intuitively, one might expect the defmacro to override the
+  ;; macrolet since macrolet's is explicitly called out as being
+  ;; equivalent to toplevel, but CLISP and SBCL both evaluate the form
+  ;; this way, so we should too.
+  (test-byte-comp-compile-and-load
+    '(require 'cl-lib)
+    '(cl-macrolet ((m () 4))
+      (defmacro m () 5)
+      (defun def () (m))))
+  (should (equal (funcall 'def) 4)))
 
 ;; Local Variables:
 ;; no-byte-compile: t