https tests: simplified makefile

This commit is contained in:
Evgeny Grin (Karlson2k)
2021-12-13 14:12:12 +03:00
parent ae6071dcd2
commit 73b03e9027
2 changed files with 18 additions and 50 deletions
+17 -50
View File
@@ -7,16 +7,6 @@ if USE_COVERAGE
AM_CFLAGS = --coverage
endif
if HAVE_GNUTLS_SNI
TEST_HTTPS_SNI = test_https_sni
endif
if HAVE_POSIX_THREADS
HTTPS_PARALLEL_TESTS = \
test_https_get_parallel \
test_https_get_parallel_threads
endif
.NOTPARALLEL:
MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT)
@@ -26,6 +16,20 @@ AM_CPPFLAGS = \
-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
if HAVE_POSIX_THREADS
HTTPS_PARALLEL_TESTS = \
test_https_get_parallel \
test_https_get_parallel_threads
endif
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@