From 0cca7b511c02c8b6c9ed7ae8cd950acdc8c250ef Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Sun, 3 Apr 2022 21:29:58 +0200
Subject: [PATCH] Move testModule to new test suite

Invoke testModule when the modern test suite is run with 'make check'.
---
 Makefile.am  | 9 +++------
 configure.ac | 6 ------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3f5a9ae83..f8e252f1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,7 +166,7 @@ runxmlconf_LDADD= $(LDADDS)
 
 runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
           testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT) \
-          testThreads$(EXEEXT)
+          testModule$(EXEEXT) testThreads$(EXEEXT)
 	[ -d test   ] || $(LN_S) $(srcdir)/test   .
 	[ -d result ] || $(LN_S) $(srcdir)/result .
 	$(CHECKER) ./runtest$(EXEEXT) && \
@@ -174,6 +174,7 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
 	    ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER) ./testapi$(EXEEXT) && \
 	    $(CHECKER) ./testchar$(EXEEXT) && \
 	    $(CHECKER) ./testdict$(EXEEXT) && \
+	    $(CHECKER) ./testModule$(EXEEXT) && \
 	    $(CHECKER) ./testThreads$(EXEEXT) && \
 	    $(CHECKER) ./runxmlconf$(EXEEXT)
 	@cd fuzz; $(MAKE) tests
@@ -194,7 +195,7 @@ asan:
 
 testall : tests SVGtests
 
-tests: $(TEST_DEBUG) $(TEST_CATALOG) $(TEST_REGEXPS) $(TEST_SCHEMATRON) Timingtests $(TEST_VTIME) $(PYTHON_TESTS) $(TEST_MODULES)
+tests: $(TEST_DEBUG) $(TEST_CATALOG) $(TEST_REGEXPS) $(TEST_SCHEMATRON) Timingtests $(TEST_VTIME) $(PYTHON_TESTS)
 	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
 	    $(MAKE) -s tests ; fi)
 	@(cd doc/examples ; $(MAKE) -s tests)
@@ -437,10 +438,6 @@ SchemasPythonTests:
 	  fi)
 	@(if [ -x $(PYTHON) -a -d xstc ] ; then cd xstc ; $(MAKE) CHECKER="$(CHECKER)" pytests ; fi)
 
-ModuleTests: testModule$(EXEEXT) testdso.la
-	@echo "## Module tests"
-	@(./testModule$(EXEEXT))
-
 cleanup:
 	-@(find . -name .\#\* -exec rm {} \;)
 	-@(find . -name \*.gcda -o -name \*.gcno -exec rm -f {} \;)
diff --git a/configure.ac b/configure.ac
index ddb817363..44bfce9f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -758,7 +758,6 @@ AM_CONDITIONAL([WITH_PYTHON], [test "x$with_python" != "xno"])
 
 dnl check for dso support
 WITH_MODULES=0
-TEST_MODULES=
 
 if test "$with_modules" != "no" ; then
  case "$host" in
@@ -807,14 +806,9 @@ if test "$with_modules" != "no" ; then
  esac
 fi
 
-if test "${WITH_MODULES}" = "1"; then
-  TEST_MODULES="ModuleTests"
-fi  
-
 AC_SUBST(WITH_MODULES)
 AC_SUBST(MODULE_PLATFORM_LIBS)
 AC_SUBST(MODULE_EXTENSION)
-AC_SUBST(TEST_MODULES)
 
 dnl
 dnl Check for trio string functions