master d527bc4: * test/lisp/emacs-lisp/macroexp-tests.el (macroexp--tests-file-name): New test

[Stefan Monnier]

branch: master
commit d527bc4b7d2f69d8b3ae76be78fb9610419bd800
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * test/lisp/emacs-lisp/macroexp-tests.el (macroexp--tests-file-name): New 
test
    
    * test/lisp/emacs-lisp/macroexp-resources/m1.el:
    * test/lisp/emacs-lisp/macroexp-resources/m2.el: New files.
---
 .../m1.el}                                         | 19 ++++++-------
 .../m2.el}                                         | 19 ++++++-------
 test/lisp/emacs-lisp/macroexp-tests.el             | 33 +++++++++++++++++++++-
 3 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/test/lisp/emacs-lisp/macroexp-tests.el 
b/test/lisp/emacs-lisp/macroexp-resources/m1.el
similarity index 61%
copy from test/lisp/emacs-lisp/macroexp-tests.el
copy to test/lisp/emacs-lisp/macroexp-resources/m1.el
index 1124e3b..a2fe6ec 100644
--- a/test/lisp/emacs-lisp/macroexp-tests.el
+++ b/test/lisp/emacs-lisp/macroexp-resources/m1.el
@@ -1,6 +1,6 @@
-;;; macroexp-tests.el --- Tests for macroexp.el      -*- lexical-binding: t; 
-*-
+;;; m1.el --- Some sample code for macroexp-tests    -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2021  Stefan Monnier
+;; Copyright (C) 2021  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
@@ -24,13 +24,10 @@
 
 ;;; Code:
 
-(ert-deftest macroexp--tests-fgrep ()
-  (should (equal (macroexp--fgrep '((x) (y)) '([x] z ((u))))
-                 '((x))))
-  (should (equal (macroexp--fgrep '((x) (y)) '#2=([y] ((y #2#))))
-                 '((y))))
-  (should (equal (macroexp--fgrep '((x) (y)) '#2=([r] ((a x)) a b c d . #2#))
-                 '((x)))))
+(defconst macroexp--m1-tests-filename (macroexp-file-name))
 
-(provide 'macroexp-tests)
-;;; macroexp-tests.el ends here
+(eval-when-compile
+  (defconst macroexp--m1-tests-comp-filename (macroexp-file-name)))
+
+(provide 'm1)
+;;; m1.el ends here
diff --git a/test/lisp/emacs-lisp/macroexp-tests.el 
b/test/lisp/emacs-lisp/macroexp-resources/m2.el
similarity index 61%
copy from test/lisp/emacs-lisp/macroexp-tests.el
copy to test/lisp/emacs-lisp/macroexp-resources/m2.el
index 1124e3b..4f2b96d 100644
--- a/test/lisp/emacs-lisp/macroexp-tests.el
+++ b/test/lisp/emacs-lisp/macroexp-resources/m2.el
@@ -1,6 +1,6 @@
-;;; macroexp-tests.el --- Tests for macroexp.el      -*- lexical-binding: t; 
-*-
+;;; m2.el --- More sample code for macroexp-tests    -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2021  Stefan Monnier
+;; Copyright (C) 2021  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
@@ -24,13 +24,10 @@
 
 ;;; Code:
 
-(ert-deftest macroexp--tests-fgrep ()
-  (should (equal (macroexp--fgrep '((x) (y)) '([x] z ((u))))
-                 '((x))))
-  (should (equal (macroexp--fgrep '((x) (y)) '#2=([y] ((y #2#))))
-                 '((y))))
-  (should (equal (macroexp--fgrep '((x) (y)) '#2=([r] ((a x)) a b c d . #2#))
-                 '((x)))))
+(defconst macroexp--m2-tests-filename (macroexp-file-name))
 
-(provide 'macroexp-tests)
-;;; macroexp-tests.el ends here
+(byte-compile-file (expand-file-name
+                    "m1.el" (file-name-directory macroexp--m2-tests-filename)))
+
+(provide 'm2)
+;;; m2.el ends here
diff --git a/test/lisp/emacs-lisp/macroexp-tests.el 
b/test/lisp/emacs-lisp/macroexp-tests.el
index 1124e3b..0b26f10 100644
--- a/test/lisp/emacs-lisp/macroexp-tests.el
+++ b/test/lisp/emacs-lisp/macroexp-tests.el
@@ -1,6 +1,6 @@
 ;;; macroexp-tests.el --- Tests for macroexp.el      -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2021  Stefan Monnier
+;; Copyright (C) 2021  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
@@ -32,5 +32,36 @@
   (should (equal (macroexp--fgrep '((x) (y)) '#2=([r] ((a x)) a b c d . #2#))
                  '((x)))))
 
+(defconst macroexp--tests-filename (macroexp-file-name))
+
+(ert-deftest macroexp--tests-file-name ()
+  (should (string-match
+           "\\`macroexp-tests.elc?\\'"
+           (file-name-nondirectory macroexp--tests-filename)))
+  (let ((rsrc-dir (expand-file-name
+                   "macroexp-resources"
+                   (file-name-directory macroexp--tests-filename))))
+    (with-current-buffer
+        (find-file-noselect (expand-file-name "m1.el" rsrc-dir))
+      (defvar macroexp--m1-tests-filename)
+      ;; `macroexp-file-name' should work with `eval-buffer'.
+      (eval-buffer)
+      (should (equal "m1.el"
+                     (file-name-nondirectory macroexp--m1-tests-filename)))
+      (search-forward "macroexp--m1-tests-filename")
+      (makunbound 'macroexp--m1-tests-filename)
+      ;; `macroexp-file-name' should also work with `eval-defun'.
+      (eval-defun nil)
+      (should (equal "m1.el"
+                     (file-name-nondirectory macroexp--m1-tests-filename))))
+
+    ;; Test the case where we load a file which byte-compiles another.
+    (defvar macroexp--m1-tests-comp-filename)
+    (makunbound 'macroexp--m1-tests-comp-filename)
+    (load (expand-file-name "m2.el" rsrc-dir))
+    (should (equal "m1.el"
+                   (file-name-nondirectory 
macroexp--m1-tests-comp-filename)))))
+
+
 (provide 'macroexp-tests)
 ;;; macroexp-tests.el ends here