diff --git a/configure.ac b/configure.ac index 2bf5bbe7..68d1e05f 100644 --- a/configure.ac +++ b/configure.ac @@ -3616,7 +3616,7 @@ AS_VAR_IF([[enable_asserts]], [["yes"]], ) AS_UNSET([enabled_sanitizers]) -AM_TESTS_ENVIRONMENT="" +TESTS_ENVIRONMENT_ac="" AM_ASAN_OPTIONS="" AM_UBSAN_OPTIONS="" AM_LSAN_OPTIONS="" @@ -4105,7 +4105,7 @@ int main(void) AS_VAR_IF([enable_san_leak], ["yes"], [AM_LSAN_OPTIONS="use_unaligned=1"] ) - AM_TESTS_ENVIRONMENT='\ + TESTS_ENVIRONMENT_ac='\ ASAN_OPTIONS="$(AM_ASAN_OPTIONS)" ; export ASAN_OPTIONS ; \ UBSAN_OPTIONS="$(AM_UBSAN_OPTIONS)" ; export UBSAN_OPTIONS ; \ LSAN_OPTIONS="$(AM_LSAN_OPTIONS)" ; export LSAN_OPTIONS ;' @@ -4132,7 +4132,7 @@ AM_CONDITIONAL([USE_SANITIZERS], AC_SUBST([AM_ASAN_OPTIONS]) AC_SUBST([AM_UBSAN_OPTIONS]) AC_SUBST([AM_LSAN_OPTIONS]) -AC_SUBST([AM_TESTS_ENVIRONMENT]) +AC_SUBST([TESTS_ENVIRONMENT_ac]) MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS" diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index cdb787d9..c7a24354 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -9,6 +9,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@ AM_LDFLAGS = $(LDFLAGS_ac) +AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac) + if USE_COVERAGE AM_CFLAGS += --coverage endif diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index c222b5db..7946745a 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -12,6 +12,8 @@ AM_LDFLAGS = $(LDFLAGS_ac) MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT) +AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac) + if USE_COVERAGE AM_CFLAGS += --coverage endif diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am index c25abab7..8e6e623a 100644 --- a/src/microhttpd/Makefile.am +++ b/src/microhttpd/Makefile.am @@ -8,6 +8,8 @@ AM_CFLAGS = $(CFLAGS_ac) $(HIDDEN_VISIBILITY_CFLAGS) AM_LDFLAGS = $(LDFLAGS_ac) +AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac) + lib_LTLIBRARIES = \ libmicrohttpd.la diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am index 11a489c3..1d198976 100644 --- a/src/testcurl/Makefile.am +++ b/src/testcurl/Makefile.am @@ -15,6 +15,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@ AM_LDFLAGS = $(LDFLAGS_ac) +AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac) + if USE_COVERAGE AM_CFLAGS += -fprofile-arcs -ftest-coverage endif diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am index 324076ef..324a5314 100644 --- a/src/testcurl/https/Makefile.am +++ b/src/testcurl/https/Makefile.am @@ -16,6 +16,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@ AM_LDFLAGS = $(LDFLAGS_ac) +AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac) + if USE_COVERAGE AM_CFLAGS += --coverage endif diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am index 12154dc2..d82d04e4 100644 --- a/src/testzzuf/Makefile.am +++ b/src/testzzuf/Makefile.am @@ -10,6 +10,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@ AM_LDFLAGS = $(LDFLAGS_ac) +AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac) + if USE_COVERAGE AM_CFLAGS += -fprofile-arcs -ftest-coverage endif