From d527bc4b7d2f69d8b3ae76be78fb9610419bd800 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 24 Feb 2021 18:12:18 -0500
Subject: [PATCH] * 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.
---
 test/lisp/emacs-lisp/macroexp-resources/m1.el | 33 +++++++++++++++++++
 test/lisp/emacs-lisp/macroexp-resources/m2.el | 33 +++++++++++++++++++
 test/lisp/emacs-lisp/macroexp-tests.el        | 33 ++++++++++++++++++-
 3 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 test/lisp/emacs-lisp/macroexp-resources/m1.el
 create mode 100644 test/lisp/emacs-lisp/macroexp-resources/m2.el

diff --git a/test/lisp/emacs-lisp/macroexp-resources/m1.el b/test/lisp/emacs-lisp/macroexp-resources/m1.el
new file mode 100644
index 00000000000..a2fe6ecf2ed
--- /dev/null
+++ b/test/lisp/emacs-lisp/macroexp-resources/m1.el
@@ -0,0 +1,33 @@
+;;; m1.el --- Some sample code for macroexp-tests    -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2021  Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(defconst macroexp--m1-tests-filename (macroexp-file-name))
+
+(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-resources/m2.el b/test/lisp/emacs-lisp/macroexp-resources/m2.el
new file mode 100644
index 00000000000..4f2b96d8ca0
--- /dev/null
+++ b/test/lisp/emacs-lisp/macroexp-resources/m2.el
@@ -0,0 +1,33 @@
+;;; m2.el --- More sample code for macroexp-tests    -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2021  Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(defconst macroexp--m2-tests-filename (macroexp-file-name))
+
+(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 1124e3b8d91..0b26f109b9e 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
-- 
2.39.2