libmicrohttpd

HTTP/1.x server C library (MHD 1.x, stable)
Log | Files | Refs | Submodules | README | LICENSE

commit e163ad95a7232de374d03a6cf4a44bffbde31d3c
parent 849b9eebc199250642d25dad18e652d7a044a80b
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Thu,  2 Sep 2021 16:09:34 +0300

Disabled parallel make for curltest if heavy tests are enabled

Diffstat:
Mconfigure.ac | 10+++++++++-
Msrc/testcurl/Makefile.am | 2++
2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac @@ -989,7 +989,13 @@ AC_ARG_ENABLE([[heavy-tests]], [a dedicated host with minimal number of background processes and no network] [activity is recommended to enable.])], [], [enable_heavy_tests=no]) -AS_VAR_IF([enable_heavy_tests], ["yes"], [], [enable_heavy_tests=no]) +AS_VAR_IF([enable_heavy_tests], ["yes"], + [HEAVY_TESTS_NOTPARALLEL='.NOTPARALLEL:'], + [ + enable_heavy_tests=no + HEAVY_TESTS_NOTPARALLEL=" " + ] +) AM_CONDITIONAL([HEAVY_TESTS],[test "x$enable_heavy_tests" = "xyes"]) AC_ARG_ENABLE([[poll]], @@ -2529,6 +2535,8 @@ AS_VAR_IF([[enable_asserts]], [["yes"]], MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS -export-dynamic -no-undefined" +AC_SUBST([CPU_COUNT]) +AC_SUBST([HEAVY_TESTS_NOTPARALLEL]) AC_SUBST(MHD_LIB_CPPFLAGS) AC_SUBST(MHD_LIB_CFLAGS) AC_SUBST(MHD_LIB_LDFLAGS) diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am @@ -1,6 +1,8 @@ # This Makefile.am is in the public domain EMPTY_ITEM = +@HEAVY_TESTS_NOTPARALLEL@ + SUBDIRS = . if USE_COVERAGE