diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-01-11 17:47:44 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-01-12 19:15:16 +0300 |
commit | 856d71686610e5e708ae796be1d0cd2c2c7cf579 (patch) | |
tree | f148df16c4718fdb7154105c5eed62b3d1ab525e | |
parent | 14a46d9c0958f7e3ac481af5175d6c53dd614ee7 (diff) | |
download | libmicrohttpd-856d71686610e5e708ae796be1d0cd2c2c7cf579.tar.gz libmicrohttpd-856d71686610e5e708ae796be1d0cd2c2c7cf579.zip |
testcurl tests: updated to use test helpers in local headers
-rw-r--r-- | src/testcurl/Makefile.am | 80 | ||||
-rw-r--r-- | src/testcurl/test_add_conn.c | 3 | ||||
-rw-r--r-- | src/testcurl/test_get.c | 3 | ||||
-rw-r--r-- | src/testcurl/test_get_close_keep_alive.c | 3 | ||||
-rw-r--r-- | src/testcurl/test_get_empty.c | 3 | ||||
-rw-r--r-- | src/testcurl/test_large_put.c | 3 | ||||
-rw-r--r-- | src/testcurl/test_toolarge.c | 3 | ||||
-rw-r--r-- | src/testcurl/test_tricky.c | 3 |
8 files changed, 53 insertions, 48 deletions
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am index 3d9f6000..da209679 100644 --- a/src/testcurl/Makefile.am +++ b/src/testcurl/Makefile.am | |||
@@ -183,7 +183,7 @@ test_concurrent_stop_LDADD = \ | |||
183 | $(PTHREAD_LIBS) $(LDADD) | 183 | $(PTHREAD_LIBS) $(LDADD) |
184 | 184 | ||
185 | test_get_SOURCES = \ | 185 | test_get_SOURCES = \ |
186 | test_get.c | 186 | test_get.c mhd_has_in_name.h mhd_has_param.h |
187 | 187 | ||
188 | test_quiesce_SOURCES = \ | 188 | test_quiesce_SOURCES = \ |
189 | test_quiesce.c mhd_has_param.h mhd_has_in_name.h | 189 | test_quiesce.c mhd_has_param.h mhd_has_in_name.h |
@@ -264,56 +264,54 @@ test_urlparse_SOURCES = \ | |||
264 | 264 | ||
265 | test_get_response_cleanup_SOURCES = \ | 265 | test_get_response_cleanup_SOURCES = \ |
266 | test_get_response_cleanup.c mhd_has_in_name.h | 266 | test_get_response_cleanup.c mhd_has_in_name.h |
267 | test_get_response_cleanup_LDADD = \ | ||
268 | $(top_builddir)/src/microhttpd/libmicrohttpd.la | ||
269 | 267 | ||
270 | test_get_chunked_SOURCES = \ | 268 | test_get_chunked_SOURCES = \ |
271 | test_get_chunked.c | 269 | test_get_chunked.c mhd_has_in_name.h |
272 | 270 | ||
273 | test_get_chunked_close_SOURCES = \ | 271 | test_get_chunked_close_SOURCES = \ |
274 | test_get_chunked.c | 272 | test_get_chunked.c mhd_has_in_name.h |
275 | 273 | ||
276 | test_get_chunked_string_SOURCES = \ | 274 | test_get_chunked_string_SOURCES = \ |
277 | test_get_chunked.c | 275 | test_get_chunked.c mhd_has_in_name.h |
278 | 276 | ||
279 | test_get_chunked_close_string_SOURCES = \ | 277 | test_get_chunked_close_string_SOURCES = \ |
280 | test_get_chunked.c | 278 | test_get_chunked.c mhd_has_in_name.h |
281 | 279 | ||
282 | test_get_chunked_empty_SOURCES = \ | 280 | test_get_chunked_empty_SOURCES = \ |
283 | test_get_chunked.c | 281 | test_get_chunked.c mhd_has_in_name.h |
284 | 282 | ||
285 | test_get_chunked_close_empty_SOURCES = \ | 283 | test_get_chunked_close_empty_SOURCES = \ |
286 | test_get_chunked.c | 284 | test_get_chunked.c mhd_has_in_name.h |
287 | 285 | ||
288 | test_get_chunked_string_empty_SOURCES = \ | 286 | test_get_chunked_string_empty_SOURCES = \ |
289 | test_get_chunked.c | 287 | test_get_chunked.c mhd_has_in_name.h |
290 | 288 | ||
291 | test_get_chunked_close_string_empty_SOURCES = \ | 289 | test_get_chunked_close_string_empty_SOURCES = \ |
292 | test_get_chunked.c | 290 | test_get_chunked.c mhd_has_in_name.h |
293 | 291 | ||
294 | test_get_chunked_sized_SOURCES = \ | 292 | test_get_chunked_sized_SOURCES = \ |
295 | test_get_chunked.c | 293 | test_get_chunked.c mhd_has_in_name.h |
296 | 294 | ||
297 | test_get_chunked_close_sized_SOURCES = \ | 295 | test_get_chunked_close_sized_SOURCES = \ |
298 | test_get_chunked.c | 296 | test_get_chunked.c mhd_has_in_name.h |
299 | 297 | ||
300 | test_get_chunked_empty_sized_SOURCES = \ | 298 | test_get_chunked_empty_sized_SOURCES = \ |
301 | test_get_chunked.c | 299 | test_get_chunked.c mhd_has_in_name.h |
302 | 300 | ||
303 | test_get_chunked_close_empty_sized_SOURCES = \ | 301 | test_get_chunked_close_empty_sized_SOURCES = \ |
304 | test_get_chunked.c | 302 | test_get_chunked.c mhd_has_in_name.h |
305 | 303 | ||
306 | test_get_chunked_forced_SOURCES = \ | 304 | test_get_chunked_forced_SOURCES = \ |
307 | test_get_chunked.c | 305 | test_get_chunked.c mhd_has_in_name.h |
308 | 306 | ||
309 | test_get_chunked_close_forced_SOURCES = \ | 307 | test_get_chunked_close_forced_SOURCES = \ |
310 | test_get_chunked.c | 308 | test_get_chunked.c mhd_has_in_name.h |
311 | 309 | ||
312 | test_get_chunked_empty_forced_SOURCES = \ | 310 | test_get_chunked_empty_forced_SOURCES = \ |
313 | test_get_chunked.c | 311 | test_get_chunked.c mhd_has_in_name.h |
314 | 312 | ||
315 | test_get_chunked_close_empty_forced_SOURCES = \ | 313 | test_get_chunked_close_empty_forced_SOURCES = \ |
316 | test_get_chunked.c | 314 | test_get_chunked.c mhd_has_in_name.h |
317 | 315 | ||
318 | test_post_SOURCES = \ | 316 | test_post_SOURCES = \ |
319 | test_post.c mhd_has_in_name.h | 317 | test_post.c mhd_has_in_name.h |
@@ -351,35 +349,35 @@ test_put_chunked_SOURCES = \ | |||
351 | test_put_chunked.c | 349 | test_put_chunked.c |
352 | 350 | ||
353 | test_add_conn_SOURCES = \ | 351 | test_add_conn_SOURCES = \ |
354 | test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h | 352 | test_add_conn.c mhd_has_in_name.h mhd_has_param.h |
355 | test_add_conn_CFLAGS = \ | 353 | test_add_conn_CFLAGS = \ |
356 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) | 354 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) |
357 | test_add_conn_LDADD = \ | 355 | test_add_conn_LDADD = \ |
358 | $(PTHREAD_LIBS) $(LDADD) | 356 | $(PTHREAD_LIBS) $(LDADD) |
359 | 357 | ||
360 | test_add_conn_nolisten_SOURCES = \ | 358 | test_add_conn_nolisten_SOURCES = \ |
361 | test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h | 359 | test_add_conn.c mhd_has_in_name.h mhd_has_param.h |
362 | test_add_conn_nolisten_CFLAGS = \ | 360 | test_add_conn_nolisten_CFLAGS = \ |
363 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) | 361 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) |
364 | test_add_conn_nolisten_LDADD = \ | 362 | test_add_conn_nolisten_LDADD = \ |
365 | $(PTHREAD_LIBS) $(LDADD) | 363 | $(PTHREAD_LIBS) $(LDADD) |
366 | 364 | ||
367 | test_add_conn_cleanup_SOURCES = \ | 365 | test_add_conn_cleanup_SOURCES = \ |
368 | test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h | 366 | test_add_conn.c mhd_has_in_name.h mhd_has_param.h |
369 | test_add_conn_cleanup_CFLAGS = \ | 367 | test_add_conn_cleanup_CFLAGS = \ |
370 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) | 368 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) |
371 | test_add_conn_cleanup_LDADD = \ | 369 | test_add_conn_cleanup_LDADD = \ |
372 | $(PTHREAD_LIBS) $(LDADD) | 370 | $(PTHREAD_LIBS) $(LDADD) |
373 | 371 | ||
374 | test_add_conn_cleanup_nolisten_SOURCES = \ | 372 | test_add_conn_cleanup_nolisten_SOURCES = \ |
375 | test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h | 373 | test_add_conn.c mhd_has_in_name.h mhd_has_param.h |
376 | test_add_conn_cleanup_nolisten_CFLAGS = \ | 374 | test_add_conn_cleanup_nolisten_CFLAGS = \ |
377 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) | 375 | $(PTHREAD_CFLAGS) $(AM_CFLAGS) |
378 | test_add_conn_cleanup_nolisten_LDADD = \ | 376 | test_add_conn_cleanup_nolisten_LDADD = \ |
379 | $(PTHREAD_LIBS) $(LDADD) | 377 | $(PTHREAD_LIBS) $(LDADD) |
380 | 378 | ||
381 | test_get11_SOURCES = \ | 379 | test_get11_SOURCES = \ |
382 | test_get.c | 380 | test_get.c mhd_has_in_name.h mhd_has_param.h |
383 | 381 | ||
384 | test_get_iovec11_SOURCES = \ | 382 | test_get_iovec11_SOURCES = \ |
385 | test_get_iovec.c mhd_has_in_name.h | 383 | test_get_iovec.c mhd_has_in_name.h |
@@ -388,16 +386,16 @@ test_get_sendfile11_SOURCES = \ | |||
388 | test_get_sendfile.c mhd_has_in_name.h | 386 | test_get_sendfile.c mhd_has_in_name.h |
389 | 387 | ||
390 | test_get_close_SOURCES = \ | 388 | test_get_close_SOURCES = \ |
391 | test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h | 389 | test_get_close_keep_alive.c mhd_has_in_name.h mhd_has_param.h |
392 | 390 | ||
393 | test_get_close10_SOURCES = \ | 391 | test_get_close10_SOURCES = \ |
394 | test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h | 392 | test_get_close_keep_alive.c mhd_has_in_name.h mhd_has_param.h |
395 | 393 | ||
396 | test_get_keep_alive_SOURCES = \ | 394 | test_get_keep_alive_SOURCES = \ |
397 | test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h | 395 | test_get_close_keep_alive.c mhd_has_in_name.h mhd_has_param.h |
398 | 396 | ||
399 | test_get_keep_alive10_SOURCES = \ | 397 | test_get_keep_alive10_SOURCES = \ |
400 | test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h | 398 | test_get_close_keep_alive.c mhd_has_in_name.h mhd_has_param.h |
401 | 399 | ||
402 | test_post11_SOURCES = \ | 400 | test_post11_SOURCES = \ |
403 | test_post.c mhd_has_in_name.h | 401 | test_post.c mhd_has_in_name.h |
@@ -414,13 +412,13 @@ test_put11_SOURCES = \ | |||
414 | test_put.c mhd_has_in_name.h | 412 | test_put.c mhd_has_in_name.h |
415 | 413 | ||
416 | test_large_put_SOURCES = \ | 414 | test_large_put_SOURCES = \ |
417 | test_large_put.c | 415 | test_large_put.c mhd_has_in_name.h mhd_has_param.h |
418 | 416 | ||
419 | test_large_put11_SOURCES = \ | 417 | test_large_put11_SOURCES = \ |
420 | test_large_put.c | 418 | test_large_put.c mhd_has_in_name.h mhd_has_param.h |
421 | 419 | ||
422 | test_large_put_inc11_SOURCES = \ | 420 | test_large_put_inc11_SOURCES = \ |
423 | test_large_put.c | 421 | test_large_put.c mhd_has_in_name.h mhd_has_param.h |
424 | 422 | ||
425 | test_long_header_SOURCES = \ | 423 | test_long_header_SOURCES = \ |
426 | test_long_header.c mhd_has_in_name.h | 424 | test_long_header.c mhd_has_in_name.h |
@@ -438,32 +436,32 @@ test_timeout_SOURCES = \ | |||
438 | test_timeout.c mhd_has_in_name.h | 436 | test_timeout.c mhd_has_in_name.h |
439 | 437 | ||
440 | test_toolarge_method_SOURCES = \ | 438 | test_toolarge_method_SOURCES = \ |
441 | test_toolarge.c ../microhttpd/test_helpers.h | 439 | test_toolarge.c mhd_has_in_name.h mhd_has_param.h |
442 | 440 | ||
443 | test_toolarge_url_SOURCES = \ | 441 | test_toolarge_url_SOURCES = \ |
444 | test_toolarge.c ../microhttpd/test_helpers.h | 442 | test_toolarge.c mhd_has_in_name.h mhd_has_param.h |
445 | 443 | ||
446 | test_toolarge_request_header_name_SOURCES = \ | 444 | test_toolarge_request_header_name_SOURCES = \ |
447 | test_toolarge.c ../microhttpd/test_helpers.h | 445 | test_toolarge.c mhd_has_in_name.h mhd_has_param.h |
448 | 446 | ||
449 | test_toolarge_request_header_value_SOURCES = \ | 447 | test_toolarge_request_header_value_SOURCES = \ |
450 | test_toolarge.c ../microhttpd/test_helpers.h | 448 | test_toolarge.c mhd_has_in_name.h mhd_has_param.h |
451 | 449 | ||
452 | test_toolarge_request_headers_SOURCES = \ | 450 | test_toolarge_request_headers_SOURCES = \ |
453 | test_toolarge.c ../microhttpd/test_helpers.h | 451 | test_toolarge.c mhd_has_in_name.h mhd_has_param.h |
454 | 452 | ||
455 | test_toolarge_reply_header_name_SOURCES = \ | 453 | test_toolarge_reply_header_name_SOURCES = \ |
456 | test_toolarge.c ../microhttpd/test_helpers.h | 454 | test_toolarge.c mhd_has_in_name.h mhd_has_param.h |
457 | 455 | ||
458 | test_toolarge_reply_header_value_SOURCES = \ | 456 | test_toolarge_reply_header_value_SOURCES = \ |
459 | test_toolarge.c ../microhttpd/test_helpers.h | 457 | test_toolarge.c mhd_has_in_name.h mhd_has_param.h |
460 | 458 | ||
461 | test_toolarge_reply_headers_SOURCES = \ | 459 | test_toolarge_reply_headers_SOURCES = \ |
462 | test_toolarge.c ../microhttpd/test_helpers.h | 460 | test_toolarge.c mhd_has_in_name.h mhd_has_param.h |
463 | 461 | ||
464 | test_tricky_url_SOURCES = \ | 462 | test_tricky_url_SOURCES = \ |
465 | test_tricky.c ../microhttpd/test_helpers.h | 463 | test_tricky.c mhd_has_in_name.h mhd_has_param.h |
466 | 464 | ||
467 | test_tricky_header2_SOURCES = \ | 465 | test_tricky_header2_SOURCES = \ |
468 | test_tricky.c ../microhttpd/test_helpers.h | 466 | test_tricky.c mhd_has_in_name.h mhd_has_param.h |
469 | \ No newline at end of file | 467 | \ No newline at end of file |
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c index 8f3916ab..49e2c9a9 100644 --- a/src/testcurl/test_add_conn.c +++ b/src/testcurl/test_add_conn.c | |||
@@ -32,7 +32,8 @@ | |||
32 | #include <stdlib.h> | 32 | #include <stdlib.h> |
33 | #include <string.h> | 33 | #include <string.h> |
34 | #include <time.h> | 34 | #include <time.h> |
35 | #include "test_helpers.h" | 35 | #include "mhd_has_in_name.h" |
36 | #include "mhd_has_param.h" | ||
36 | #include "mhd_sockets.h" /* only macros used */ | 37 | #include "mhd_sockets.h" /* only macros used */ |
37 | 38 | ||
38 | 39 | ||
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c index 26b32b11..58febf7a 100644 --- a/src/testcurl/test_get.c +++ b/src/testcurl/test_get.c | |||
@@ -31,7 +31,8 @@ | |||
31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
32 | #include <string.h> | 32 | #include <string.h> |
33 | #include <time.h> | 33 | #include <time.h> |
34 | #include "test_helpers.h" | 34 | #include "mhd_has_in_name.h" |
35 | #include "mhd_has_param.h" | ||
35 | #include "mhd_sockets.h" /* only macros used */ | 36 | #include "mhd_sockets.h" /* only macros used */ |
36 | 37 | ||
37 | 38 | ||
diff --git a/src/testcurl/test_get_close_keep_alive.c b/src/testcurl/test_get_close_keep_alive.c index db8a0284..53911f5b 100644 --- a/src/testcurl/test_get_close_keep_alive.c +++ b/src/testcurl/test_get_close_keep_alive.c | |||
@@ -34,7 +34,8 @@ | |||
34 | #include <stdlib.h> | 34 | #include <stdlib.h> |
35 | #include <string.h> | 35 | #include <string.h> |
36 | #include <time.h> | 36 | #include <time.h> |
37 | #include "test_helpers.h" | 37 | #include "mhd_has_in_name.h" |
38 | #include "mhd_has_param.h" | ||
38 | #include "mhd_sockets.h" /* only macros used */ | 39 | #include "mhd_sockets.h" /* only macros used */ |
39 | 40 | ||
40 | #ifdef HAVE_STRINGS_H | 41 | #ifdef HAVE_STRINGS_H |
diff --git a/src/testcurl/test_get_empty.c b/src/testcurl/test_get_empty.c index e75e907c..5ed71ab9 100644 --- a/src/testcurl/test_get_empty.c +++ b/src/testcurl/test_get_empty.c | |||
@@ -31,7 +31,8 @@ | |||
31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
32 | #include <string.h> | 32 | #include <string.h> |
33 | #include <time.h> | 33 | #include <time.h> |
34 | #include "test_helpers.h" | 34 | #include "mhd_has_in_name.h" |
35 | #include "mhd_has_param.h" | ||
35 | #include "mhd_sockets.h" /* only macros used */ | 36 | #include "mhd_sockets.h" /* only macros used */ |
36 | 37 | ||
37 | 38 | ||
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c index ff9b4eb3..9c26adbd 100644 --- a/src/testcurl/test_large_put.c +++ b/src/testcurl/test_large_put.c | |||
@@ -38,7 +38,8 @@ | |||
38 | #include <unistd.h> | 38 | #include <unistd.h> |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #include "test_helpers.h" | 41 | #include "mhd_has_in_name.h" |
42 | #include "mhd_has_param.h" | ||
42 | 43 | ||
43 | #if defined(MHD_CPU_COUNT) && (MHD_CPU_COUNT + 0) < 2 | 44 | #if defined(MHD_CPU_COUNT) && (MHD_CPU_COUNT + 0) < 2 |
44 | #undef MHD_CPU_COUNT | 45 | #undef MHD_CPU_COUNT |
diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c index 4f33da2a..7cbb1545 100644 --- a/src/testcurl/test_toolarge.c +++ b/src/testcurl/test_toolarge.c | |||
@@ -39,7 +39,8 @@ | |||
39 | #include <stdlib.h> | 39 | #include <stdlib.h> |
40 | #include <string.h> | 40 | #include <string.h> |
41 | #include <time.h> | 41 | #include <time.h> |
42 | #include "test_helpers.h" | 42 | #include "mhd_has_in_name.h" |
43 | #include "mhd_has_param.h" | ||
43 | #include "mhd_sockets.h" /* only macros used */ | 44 | #include "mhd_sockets.h" /* only macros used */ |
44 | 45 | ||
45 | #ifdef HAVE_STRINGS_H | 46 | #ifdef HAVE_STRINGS_H |
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c index fb881fd6..b926884f 100644 --- a/src/testcurl/test_tricky.c +++ b/src/testcurl/test_tricky.c | |||
@@ -31,7 +31,8 @@ | |||
31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
32 | #include <string.h> | 32 | #include <string.h> |
33 | #include <time.h> | 33 | #include <time.h> |
34 | #include "test_helpers.h" | 34 | #include "mhd_has_in_name.h" |
35 | #include "mhd_has_param.h" | ||
35 | #include "mhd_sockets.h" /* only macros used */ | 36 | #include "mhd_sockets.h" /* only macros used */ |
36 | 37 | ||
37 | #ifdef HAVE_STRINGS_H | 38 | #ifdef HAVE_STRINGS_H |