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

[Glenn Morris]

branch: emacs-27
commit cc7f9714858ab9f1fc30ffcfc5acc018da2b5d4d
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Glenn Morris <rgm@gnu.org>

    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)
---
 test/Makefile.in               | 4 +---
 test/src/emacs-module-tests.el | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/Makefile.in b/test/Makefile.in
index f03c194..0003e76 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 9120615..9df0b25 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'.