From: Philipp Stephani <phst@google.com>
Date: Wed, 14 Jun 2017 10:18:36 +0000 (+0200)
Subject: Use --module-assertions if modules are available
X-Git-Tag: emacs-26.0.90~521^2~76
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac649dc4b48be3fab8c904012aca4c07b0019041;p=emacs.git

Use --module-assertions if modules are available

Using --module-assertions helps us find bugs in the test module.  But
we can use it only if Emacs was compiled with module support.

* test/Makefile.in (MODULES_EMACSOPT): New variable.
(emacs): Use it.
---

diff --git a/test/Makefile.in b/test/Makefile.in
index 9c1f2d2658f..67bb7ac2eea 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -97,11 +97,17 @@ TEST_LOCALE = C
 # this by default since it gives nicer stacktraces.
 TEST_LOAD_EL ?= yes
 
+ifeq (@HAVE_MODULES@, yes)
+MODULES_EMACSOPT := --module-assertions
+else
+MODULES_EMACSOPT :=
+endif
+
 # The actual Emacs command run in the targets below.
 # Prevent any setting of EMACSLOADPATH in user environment causing problems.
 emacs = EMACSLOADPATH= LC_ALL=$(TEST_LOCALE) \
  EMACS_TEST_DIRECTORY=$(abspath $(srcdir)) \
- $(GDB) "$(EMACS)" $(EMACSOPT)
+ $(GDB) "$(EMACS)" $(MODULES_EMACSOPT) $(EMACSOPT)
 
 test_module_dir := $(srcdir)/data/emacs-module