* test/lisp/emacs-lisp/macroexp-tests.el (macroexp--tests-file-name): Add case

Add use of `macroexp-file-name` from a macro called from within
a function, which works thanks to eager-macroexpansion (so the macro
is expanded which the file is being loaded rather than only later
when the function is called).

* test/lisp/emacs-lisp/macroexp-resources/m1.el
(macroexp--m1-tests-file-name): New function.

diff --git a/test/lisp/emacs-lisp/macroexp-resources/m1.el b/test/lisp/emacs-lisp/macroexp-resources/m1.el
index a2fe6ecf2ed666facff55f1ff1dd0b976fe06aa2..96b5f7091af6f0a9f90905b5e7155235a534f4ed 100644 (file)
--- a/test/lisp/emacs-lisp/macroexp-resources/m1.el
+++ b/test/lisp/emacs-lisp/macroexp-resources/m1.el
@@ -29,5 +29,8 @@
 (eval-when-compile
   (defconst macroexp--m1-tests-comp-filename (macroexp-file-name)))
 
+(defun macroexp--m1-tests-file-name ()
+  (macroexp--test-get-file-name))
+
 (provide 'm1)
 ;;; m1.el ends here

diff --git a/test/lisp/emacs-lisp/macroexp-tests.el b/test/lisp/emacs-lisp/macroexp-tests.el
index 0b26f109b9e198e327bf53d16a02fd1214d5e806..89d3882d1da348ac7590d843008182375e705d41 100644 (file)
--- a/test/lisp/emacs-lisp/macroexp-tests.el
+++ b/test/lisp/emacs-lisp/macroexp-tests.el
@@ -34,6 +34,8 @@
 
 (defconst macroexp--tests-filename (macroexp-file-name))
 
+(defmacro macroexp--test-get-file-name () (macroexp-file-name))
+
 (ert-deftest macroexp--tests-file-name ()
   (should (string-match
            "\\`macroexp-tests.elc?\\'"
@@ -44,10 +46,13 @@
     (with-current-buffer
         (find-file-noselect (expand-file-name "m1.el" rsrc-dir))
       (defvar macroexp--m1-tests-filename)
+      (declare-function macroexp--m1-tests-file-name "m1" ())
       ;; `macroexp-file-name' should work with `eval-buffer'.
       (eval-buffer)
       (should (equal "m1.el"
                      (file-name-nondirectory macroexp--m1-tests-filename)))
+      (should (equal "m1.el"
+                     (file-name-nondirectory (macroexp--m1-tests-file-name))))
       (search-forward "macroexp--m1-tests-filename")
       (makunbound 'macroexp--m1-tests-filename)
       ;; `macroexp-file-name' should also work with `eval-defun'.