[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 01/03: https tests: simplified makefile
|
From: |
gnunet |
|
Subject: |
[libmicrohttpd] 01/03: https tests: simplified makefile |
|
Date: |
Mon, 13 Dec 2021 19:08:15 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 73b03e9027839a222d5d82e6d7a0fcf2a6d633cf
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Mon Dec 13 13:58:39 2021 +0300
https tests: simplified makefile
---
configure.ac | 1 +
src/testcurl/https/Makefile.am | 65 +++++++++++-------------------------------
2 files changed, 17 insertions(+), 49 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9d628ee1..982e52a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -814,6 +814,7 @@ AS_IF([test "x$USE_THREADS" = "xposix"],
[AC_DEFINE([MHD_USE_W32_THREADS],[1],[define to use W32 threads])])])
AM_CONDITIONAL([USE_POSIX_THREADS], [test "x$USE_THREADS" = "xposix"])
AM_CONDITIONAL([USE_W32_THREADS], [test "x$USE_THREADS" = "xw32"])
+AM_CONDITIONAL([USE_THREADS], [test "x$USE_THREADS" != "xnone"])
AM_CONDITIONAL([DISABLE_THREADS], [test "x$USE_THREADS" = "xnone"])
AC_MSG_RESULT([$USE_THREADS])
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index f00355bb..47256c58 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -7,6 +7,19 @@ if USE_COVERAGE
AM_CFLAGS = --coverage
endif
+.NOTPARALLEL:
+
+MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT)
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/microhttpd \
+ $(LIBCURL_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS)
+
+LDADD = \
+ $(top_builddir)/src/microhttpd/libmicrohttpd.la \
+ $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
+
if HAVE_GNUTLS_SNI
TEST_HTTPS_SNI = test_https_sni
endif
@@ -17,15 +30,6 @@ if HAVE_POSIX_THREADS
test_https_get_parallel_threads
endif
-.NOTPARALLEL:
-
-MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/microhttpd \
- $(LIBCURL_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS)
-
THREAD_ONLY_TESTS = \
test_tls_options \
test_tls_authentication \
@@ -42,11 +46,7 @@ THREAD_ONLY_TESTS = \
check_PROGRAMS = \
test_https_get_select
-if USE_POSIX_THREADS
-check_PROGRAMS += \
- $(THREAD_ONLY_TESTS)
-endif
-if USE_W32_THREADS
+if USE_THREADS
check_PROGRAMS += \
$(THREAD_ONLY_TESTS)
endif
@@ -56,7 +56,6 @@ EXTRA_DIST = \
host1.crt host1.key \
host2.crt host2.key
-
TESTS = \
$(check_PROGRAMS)
@@ -66,9 +65,6 @@ test_https_time_out_SOURCES = \
tls_test_keys.h \
tls_test_common.h \
tls_test_common.c
-test_https_time_out_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_tls_options_SOURCES = \
test_tls_options.c \
@@ -76,9 +72,6 @@ test_tls_options_SOURCES = \
tls_test_common.h \
tls_test_common.c \
curl_version_check.c
-test_tls_options_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_get_parallel_SOURCES = \
test_https_get_parallel.c \
@@ -90,17 +83,13 @@ test_https_get_parallel_CPPFLAGS = \
test_https_get_parallel_CFLAGS = \
$(PTHREAD_CFLAGS) $(AM_CFLAGS)
test_https_get_parallel_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(PTHREAD_LIBS) $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@
@LIBCURL@
+ $(PTHREAD_LIBS) $(LDADD)
test_empty_response_SOURCES = \
test_empty_response.c \
tls_test_keys.h \
tls_test_common.h \
tls_test_common.c
-test_empty_response_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_get_parallel_threads_SOURCES = \
test_https_get_parallel_threads.c \
@@ -112,53 +101,37 @@ test_https_get_parallel_threads_CPPFLAGS = \
test_https_get_parallel_threads_CFLAGS = \
$(PTHREAD_CFLAGS) $(AM_CFLAGS)
test_https_get_parallel_threads_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(PTHREAD_LIBS) $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@
@LIBCURL@
+ $(PTHREAD_LIBS) $(LDADD)
test_tls_authentication_SOURCES = \
test_tls_authentication.c \
tls_test_keys.h \
tls_test_common.h \
tls_test_common.c
-test_tls_authentication_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_session_info_SOURCES = \
test_https_session_info.c \
tls_test_keys.h \
tls_test_common.h \
tls_test_common.c
-test_https_session_info_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_multi_daemon_SOURCES = \
test_https_multi_daemon.c \
tls_test_keys.h \
tls_test_common.h \
tls_test_common.c
-test_https_multi_daemon_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_get_SOURCES = \
test_https_get.c \
tls_test_keys.h \
tls_test_common.h \
tls_test_common.c
-test_https_get_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_get_iovec_SOURCES = \
test_https_get_iovec.c \
tls_test_keys.h \
tls_test_common.h \
tls_test_common.c
-test_https_get_iovec_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
if HAVE_GNUTLS_SNI
test_https_sni_SOURCES = \
@@ -169,9 +142,6 @@ test_https_sni_SOURCES = \
test_https_sni_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DABS_SRCDIR=\"$(abs_srcdir)\"
-test_https_sni_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
endif
test_https_get_select_SOURCES = \
@@ -179,6 +149,3 @@ test_https_get_select_SOURCES = \
tls_test_keys.h \
tls_test_common.h \
tls_test_common.c
-test_https_get_select_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.