From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 9 Jul 2020 23:35:48 +0000 (-0700)
Subject: Fix out-of-source ‘make check’ emacs-module-tests
X-Git-Tag: emacs-27.1.90~135
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc7f971485;p=emacs.git

Fix out-of-source ‘make check’ emacs-module-tests

Problem reported by Koki Fukuda in:
https://lists.gnu.org/r/emacs-devel/2020-07/msg00169.html
* test/Makefile.in (MODULE_CFLAGS):
Include from the same directories included from in ../src.
* test/src/emacs-module-tests.el (module/describe-function-1):
Strip path to source directory.

(cherry picked from commit c86f3fe0d023cdd25edbbce91c5b32654f2b734e)
---

diff --git a/test/Makefile.in b/test/Makefile.in
index f03c194a7cb..0003e763abe 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -258,9 +258,7 @@ endif
 GMP_LIB = @GMP_LIB@
 GMP_OBJ = $(if @GMP_OBJ@, ../src/@GMP_OBJ@)
 
-# Note: emacs-module.h is generated from emacs-module.h.in, hence we
-# look in ../src, not $(srcdir)/../src.
-MODULE_CFLAGS = -I../src -I$(srcdir)/../lib \
+MODULE_CFLAGS = -I../src -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib \
   $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
 
diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index 91206156f85..9df0b25a0c5 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -318,6 +318,9 @@ local reference."
   (with-temp-buffer
     (let ((standard-output (current-buffer)))
       (describe-function-1 #'mod-test-sum)
+      (goto-char (point-min))
+      (while (re-search-forward "`[^']*/data/emacs-module/" nil t)
+        (replace-match "`data/emacs-module/"))
       (should (equal
                (buffer-substring-no-properties 1 (point-max))
                (format "a module function in `data/emacs-module/mod-test%s'.