[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#37797: [PATCH 1/1] emacs-module-tests: fix VPATH builds
From: |
Rob Browning |
Subject: |
bug#37797: [PATCH 1/1] emacs-module-tests: fix VPATH builds |
Date: |
Fri, 21 Aug 2020 00:48:56 -0500 |
---
I'm not sure it's a desirable approach, but this does allow the
emacs-module-tests to succeed when run from an out-of-tree build,
e.g.
mkdir build && cd build && ../configure && make check
The bzr tests are still broken in that situation (if the tools are
installed), but for the moment, that's not critical here.
Hope this helps.
test/Makefile.in | 2 +-
test/src/emacs-module-tests.el | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/test/Makefile.in b/test/Makefile.in
index f03c194a7cb..6c433f1d682 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -260,7 +260,7 @@ 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$(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..1b512aff566 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -318,14 +318,15 @@ module/describe-function-1
(with-temp-buffer
(let ((standard-output (current-buffer)))
(describe-function-1 #'mod-test-sum)
- (should (equal
- (buffer-substring-no-properties 1 (point-max))
- (format "a module function in `data/emacs-module/mod-test%s'.
+ (let ((result (buffer-substring-no-properties 1 (point-max))))
+ (should (string-match-p
+ (format "a module function in
`.*data/emacs-module/mod-test%s'.
(mod-test-sum a b)
-Return A + B"
- module-file-suffix))))))
+Return A \\+ B"
+ module-file-suffix)
+ (buffer-substring-no-properties 1 (point-max))))))))
(ert-deftest module/load-history ()
"Check that Bug#30164 is fixed."
--
2.26.1