diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-12-13 13:58:39 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-12-13 14:12:12 +0300 |
commit | 73b03e9027839a222d5d82e6d7a0fcf2a6d633cf (patch) | |
tree | 816614050793dc4341b06aeceb99690fb612eab0 /src/testcurl | |
parent | ae6071dcd2aa7e8eb2d4765e1633aa75eed89e0c (diff) | |
download | libmicrohttpd-73b03e9027839a222d5d82e6d7a0fcf2a6d633cf.tar.gz libmicrohttpd-73b03e9027839a222d5d82e6d7a0fcf2a6d633cf.zip |
https tests: simplified makefile
Diffstat (limited to 'src/testcurl')
-rw-r--r-- | src/testcurl/https/Makefile.am | 65 |
1 files changed, 16 insertions, 49 deletions
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 | |||
7 | AM_CFLAGS = --coverage | 7 | AM_CFLAGS = --coverage |
8 | endif | 8 | endif |
9 | 9 | ||
10 | .NOTPARALLEL: | ||
11 | |||
12 | MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT) | ||
13 | |||
14 | AM_CPPFLAGS = \ | ||
15 | -I$(top_srcdir)/src/include \ | ||
16 | -I$(top_srcdir)/src/microhttpd \ | ||
17 | $(LIBCURL_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS) | ||
18 | |||
19 | LDADD = \ | ||
20 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
21 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
22 | |||
10 | if HAVE_GNUTLS_SNI | 23 | if HAVE_GNUTLS_SNI |
11 | TEST_HTTPS_SNI = test_https_sni | 24 | TEST_HTTPS_SNI = test_https_sni |
12 | endif | 25 | endif |
@@ -17,15 +30,6 @@ if HAVE_POSIX_THREADS | |||
17 | test_https_get_parallel_threads | 30 | test_https_get_parallel_threads |
18 | endif | 31 | endif |
19 | 32 | ||
20 | .NOTPARALLEL: | ||
21 | |||
22 | MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT) | ||
23 | |||
24 | AM_CPPFLAGS = \ | ||
25 | -I$(top_srcdir)/src/include \ | ||
26 | -I$(top_srcdir)/src/microhttpd \ | ||
27 | $(LIBCURL_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS) | ||
28 | |||
29 | THREAD_ONLY_TESTS = \ | 33 | THREAD_ONLY_TESTS = \ |
30 | test_tls_options \ | 34 | test_tls_options \ |
31 | test_tls_authentication \ | 35 | test_tls_authentication \ |
@@ -42,11 +46,7 @@ THREAD_ONLY_TESTS = \ | |||
42 | check_PROGRAMS = \ | 46 | check_PROGRAMS = \ |
43 | test_https_get_select | 47 | test_https_get_select |
44 | 48 | ||
45 | if USE_POSIX_THREADS | 49 | if USE_THREADS |
46 | check_PROGRAMS += \ | ||
47 | $(THREAD_ONLY_TESTS) | ||
48 | endif | ||
49 | if USE_W32_THREADS | ||
50 | check_PROGRAMS += \ | 50 | check_PROGRAMS += \ |
51 | $(THREAD_ONLY_TESTS) | 51 | $(THREAD_ONLY_TESTS) |
52 | endif | 52 | endif |
@@ -56,7 +56,6 @@ EXTRA_DIST = \ | |||
56 | host1.crt host1.key \ | 56 | host1.crt host1.key \ |
57 | host2.crt host2.key | 57 | host2.crt host2.key |
58 | 58 | ||
59 | |||
60 | TESTS = \ | 59 | TESTS = \ |
61 | $(check_PROGRAMS) | 60 | $(check_PROGRAMS) |
62 | 61 | ||
@@ -66,9 +65,6 @@ test_https_time_out_SOURCES = \ | |||
66 | tls_test_keys.h \ | 65 | tls_test_keys.h \ |
67 | tls_test_common.h \ | 66 | tls_test_common.h \ |
68 | tls_test_common.c | 67 | tls_test_common.c |
69 | test_https_time_out_LDADD = \ | ||
70 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
71 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
72 | 68 | ||
73 | test_tls_options_SOURCES = \ | 69 | test_tls_options_SOURCES = \ |
74 | test_tls_options.c \ | 70 | test_tls_options.c \ |
@@ -76,9 +72,6 @@ test_tls_options_SOURCES = \ | |||
76 | tls_test_common.h \ | 72 | tls_test_common.h \ |
77 | tls_test_common.c \ | 73 | tls_test_common.c \ |
78 | curl_version_check.c | 74 | curl_version_check.c |
79 | test_tls_options_LDADD = \ | ||
80 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
81 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
82 | 75 | ||
83 | test_https_get_parallel_SOURCES = \ | 76 | test_https_get_parallel_SOURCES = \ |
84 | test_https_get_parallel.c \ | 77 | test_https_get_parallel.c \ |
@@ -90,17 +83,13 @@ test_https_get_parallel_CPPFLAGS = \ | |||
90 | test_https_get_parallel_CFLAGS = \ | 83 | test_https_get_parallel_CFLAGS = \ |
91 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) | 84 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) |
92 | test_https_get_parallel_LDADD = \ | 85 | test_https_get_parallel_LDADD = \ |
93 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 86 | $(PTHREAD_LIBS) $(LDADD) |
94 | $(PTHREAD_LIBS) $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
95 | 87 | ||
96 | test_empty_response_SOURCES = \ | 88 | test_empty_response_SOURCES = \ |
97 | test_empty_response.c \ | 89 | test_empty_response.c \ |
98 | tls_test_keys.h \ | 90 | tls_test_keys.h \ |
99 | tls_test_common.h \ | 91 | tls_test_common.h \ |
100 | tls_test_common.c | 92 | tls_test_common.c |
101 | test_empty_response_LDADD = \ | ||
102 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
103 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
104 | 93 | ||
105 | test_https_get_parallel_threads_SOURCES = \ | 94 | test_https_get_parallel_threads_SOURCES = \ |
106 | test_https_get_parallel_threads.c \ | 95 | test_https_get_parallel_threads.c \ |
@@ -112,53 +101,37 @@ test_https_get_parallel_threads_CPPFLAGS = \ | |||
112 | test_https_get_parallel_threads_CFLAGS = \ | 101 | test_https_get_parallel_threads_CFLAGS = \ |
113 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) | 102 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) |
114 | test_https_get_parallel_threads_LDADD = \ | 103 | test_https_get_parallel_threads_LDADD = \ |
115 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 104 | $(PTHREAD_LIBS) $(LDADD) |
116 | $(PTHREAD_LIBS) $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
117 | 105 | ||
118 | test_tls_authentication_SOURCES = \ | 106 | test_tls_authentication_SOURCES = \ |
119 | test_tls_authentication.c \ | 107 | test_tls_authentication.c \ |
120 | tls_test_keys.h \ | 108 | tls_test_keys.h \ |
121 | tls_test_common.h \ | 109 | tls_test_common.h \ |
122 | tls_test_common.c | 110 | tls_test_common.c |
123 | test_tls_authentication_LDADD = \ | ||
124 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
125 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
126 | 111 | ||
127 | test_https_session_info_SOURCES = \ | 112 | test_https_session_info_SOURCES = \ |
128 | test_https_session_info.c \ | 113 | test_https_session_info.c \ |
129 | tls_test_keys.h \ | 114 | tls_test_keys.h \ |
130 | tls_test_common.h \ | 115 | tls_test_common.h \ |
131 | tls_test_common.c | 116 | tls_test_common.c |
132 | test_https_session_info_LDADD = \ | ||
133 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
134 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
135 | 117 | ||
136 | test_https_multi_daemon_SOURCES = \ | 118 | test_https_multi_daemon_SOURCES = \ |
137 | test_https_multi_daemon.c \ | 119 | test_https_multi_daemon.c \ |
138 | tls_test_keys.h \ | 120 | tls_test_keys.h \ |
139 | tls_test_common.h \ | 121 | tls_test_common.h \ |
140 | tls_test_common.c | 122 | tls_test_common.c |
141 | test_https_multi_daemon_LDADD = \ | ||
142 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
143 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
144 | 123 | ||
145 | test_https_get_SOURCES = \ | 124 | test_https_get_SOURCES = \ |
146 | test_https_get.c \ | 125 | test_https_get.c \ |
147 | tls_test_keys.h \ | 126 | tls_test_keys.h \ |
148 | tls_test_common.h \ | 127 | tls_test_common.h \ |
149 | tls_test_common.c | 128 | tls_test_common.c |
150 | test_https_get_LDADD = \ | ||
151 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
152 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
153 | 129 | ||
154 | test_https_get_iovec_SOURCES = \ | 130 | test_https_get_iovec_SOURCES = \ |
155 | test_https_get_iovec.c \ | 131 | test_https_get_iovec.c \ |
156 | tls_test_keys.h \ | 132 | tls_test_keys.h \ |
157 | tls_test_common.h \ | 133 | tls_test_common.h \ |
158 | tls_test_common.c | 134 | tls_test_common.c |
159 | test_https_get_iovec_LDADD = \ | ||
160 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
161 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
162 | 135 | ||
163 | if HAVE_GNUTLS_SNI | 136 | if HAVE_GNUTLS_SNI |
164 | test_https_sni_SOURCES = \ | 137 | test_https_sni_SOURCES = \ |
@@ -169,9 +142,6 @@ test_https_sni_SOURCES = \ | |||
169 | test_https_sni_CPPFLAGS = \ | 142 | test_https_sni_CPPFLAGS = \ |
170 | $(AM_CPPFLAGS) \ | 143 | $(AM_CPPFLAGS) \ |
171 | -DABS_SRCDIR=\"$(abs_srcdir)\" | 144 | -DABS_SRCDIR=\"$(abs_srcdir)\" |
172 | test_https_sni_LDADD = \ | ||
173 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
174 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||
175 | endif | 145 | endif |
176 | 146 | ||
177 | test_https_get_select_SOURCES = \ | 147 | test_https_get_select_SOURCES = \ |
@@ -179,6 +149,3 @@ test_https_get_select_SOURCES = \ | |||
179 | tls_test_keys.h \ | 149 | tls_test_keys.h \ |
180 | tls_test_common.h \ | 150 | tls_test_common.h \ |
181 | tls_test_common.c | 151 | tls_test_common.c |
182 | test_https_get_select_LDADD = \ | ||
183 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | ||
184 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | ||