[libxml2] Move testThreads to new test suite
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] Move testThreads to new test suite
- Date: Mon, 4 Apr 2022 02:33:56 +0000 (UTC)
commit f23ca9f9ea9effa9053a2d9b57dbb9e9672ada9e
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Sun Apr 3 21:25:54 2022 +0200
Move testThreads to new test suite
Invoke testThreads when the modern test suite is run with 'make check'.
Makefile.am | 12 ++++--------
configure.ac | 3 ---
2 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e1844b46..3f5a9ae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -165,7 +165,8 @@ runxmlconf_LDADD= $(LDADDS)
#testOOM_LDADD= $(LDADDS)
runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
- testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
+ testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT) \
+ testThreads$(EXEEXT)
[ -d test ] || $(LN_S) $(srcdir)/test .
[ -d result ] || $(LN_S) $(srcdir)/result .
$(CHECKER) ./runtest$(EXEEXT) && \
@@ -173,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) ./testThreads$(EXEEXT) && \
$(CHECKER) ./runxmlconf$(EXEEXT)
@cd fuzz; $(MAKE) tests
if WITH_PYTHON
@@ -192,7 +194,7 @@ asan:
testall : tests SVGtests
-tests: $(TEST_DEBUG) $(TEST_CATALOG) $(TEST_REGEXPS) $(TEST_SCHEMATRON) $(TEST_THREADS) Timingtests
$(TEST_VTIME) $(PYTHON_TESTS) $(TEST_MODULES)
+tests: $(TEST_DEBUG) $(TEST_CATALOG) $(TEST_REGEXPS) $(TEST_SCHEMATRON) Timingtests $(TEST_VTIME)
$(PYTHON_TESTS) $(TEST_MODULES)
@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
$(MAKE) -s tests ; fi)
@(cd doc/examples ; $(MAKE) -s tests)
@@ -292,12 +294,6 @@ SVGtests : xmllint$(EXEEXT)
rm result.$$name result2.$$name ; \
fi ; fi ; done)
-Threadtests : testThreads$(EXEEXT)
- @echo "## Threaded regression tests"
- -@($(CHECKER) $(top_builddir)/testThreads ; \
- grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- exit 0)
-
Regexptests: testRegexp$(EXEEXT)
@(echo > .memdump)
@echo "## Regexp regression tests"
diff --git a/configure.ac b/configure.ac
index 1ffc34c3..ddb81736 100644
--- a/configure.ac
+++ b/configure.ac
@@ -841,7 +841,6 @@ THREAD_LIBS=""
BASE_THREAD_LIBS=""
WITH_THREADS=0
THREAD_CFLAGS=""
-TEST_THREADS=""
THREADS_W32=""
WITH_THREAD_ALLOC=0
@@ -902,7 +901,6 @@ else
esac
if test "$WITH_THREADS" = "1" ; then
THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
- TEST_THREADS="Threadtests"
fi
fi
if test "$with_thread_alloc" = "yes" && test "$WITH_THREADS" = "1" ; then
@@ -913,7 +911,6 @@ AC_SUBST(THREAD_LIBS)
AC_SUBST(BASE_THREAD_LIBS)
AC_SUBST(WITH_THREADS)
AC_SUBST(THREAD_CFLAGS)
-AC_SUBST(TEST_THREADS)
AC_SUBST(WITH_THREAD_ALLOC)
AM_CONDITIONAL([THREADS_W32],[test -n "$THREADS_W32"])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]