diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-01-24 21:30:10 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-01-24 21:30:10 +0300 |
commit | b5bf6ccf78412974d3ab0be3ec262dae3d8e0443 (patch) | |
tree | 07877835d565c8f81b22acb1c6941fd9f57ab898 | |
parent | 8f66b6e03625e8b429ad61cf702dc5edf8099964 (diff) | |
download | libmicrohttpd-b5bf6ccf78412974d3ab0be3ec262dae3d8e0443.tar.gz libmicrohttpd-b5bf6ccf78412974d3ab0be3ec262dae3d8e0443.zip |
configure: added '--enable-heavy-tests'
Some tests may fail because of too intensive usage of OS resources.
Skip by default resources-heavy tests so testsute can be run on
a machine with some parallel activity.
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | src/testcurl/Makefile.am | 37 |
2 files changed, 42 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index cb9c90a1..f3c0cde3 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -933,6 +933,14 @@ AC_ARG_ENABLE([[examples]], | |||
933 | test "x$enable_examples" = "xno" || enable_examples=yes | 933 | test "x$enable_examples" = "xno" || enable_examples=yes |
934 | AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$enable_examples" = "xyes"]) | 934 | AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$enable_examples" = "xyes"]) |
935 | 935 | ||
936 | AC_ARG_ENABLE([[heavy-tests]], | ||
937 | [AS_HELP_STRING([[--enable-heavy-tests]], [use heavy tests in test-suite. WARNING:] | ||
938 | [a dedicated host with minimal number of background processes and no network] | ||
939 | [activity is recommended to enable.])], [], | ||
940 | [enable_heavy_tests=no]) | ||
941 | AS_VAR_IF([enable_heavy_tests], ["yes"], [], [enable_heavy_tests=no]) | ||
942 | AM_CONDITIONAL([HEAVY_TESTS],[test "x$enable_heavy_tests" = "xyes"]) | ||
943 | |||
936 | AC_ARG_ENABLE([[poll]], | 944 | AC_ARG_ENABLE([[poll]], |
937 | [AS_HELP_STRING([[--enable-poll[=ARG]]], [enable poll support (yes, no, auto) [auto]])], | 945 | [AS_HELP_STRING([[--enable-poll[=ARG]]], [enable poll support (yes, no, auto) [auto]])], |
938 | [enable_poll=${enableval}], | 946 | [enable_poll=${enableval}], |
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am index 3e853ff9..78f2a076 100644 --- a/src/testcurl/Makefile.am +++ b/src/testcurl/Makefile.am | |||
@@ -1,4 +1,6 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | EMPTY_ITEM = | ||
3 | |||
2 | SUBDIRS = . | 4 | SUBDIRS = . |
3 | 5 | ||
4 | if USE_COVERAGE | 6 | if USE_COVERAGE |
@@ -23,15 +25,35 @@ THREAD_ONLY_TESTS = \ | |||
23 | test_long_header11 \ | 25 | test_long_header11 \ |
24 | test_iplimit11 \ | 26 | test_iplimit11 \ |
25 | test_termination \ | 27 | test_termination \ |
28 | $(EMPTY_ITEM) | ||
29 | |||
30 | if HEAVY_TESTS | ||
31 | THREAD_ONLY_TESTS += \ | ||
26 | test_add_conn_cleanup \ | 32 | test_add_conn_cleanup \ |
27 | test_add_conn_cleanup_nolisten \ | 33 | test_add_conn_cleanup_nolisten \ |
28 | test_timeout | 34 | $(EMPTY_ITEM) |
35 | endif | ||
36 | |||
37 | THREAD_ONLY_TESTS += \ | ||
38 | test_timeout \ | ||
39 | $(EMPTY_ITEM) | ||
29 | 40 | ||
30 | if HAVE_POSIX_THREADS | 41 | if HAVE_POSIX_THREADS |
42 | if HEAVY_TESTS | ||
31 | THREAD_ONLY_TESTS += \ | 43 | THREAD_ONLY_TESTS += \ |
32 | perf_get_concurrent11 \ | 44 | perf_get_concurrent11 \ |
45 | $(EMPTY_ITEM) | ||
46 | endif | ||
47 | |||
48 | THREAD_ONLY_TESTS += \ | ||
33 | test_quiesce \ | 49 | test_quiesce \ |
34 | test_concurrent_stop | 50 | $(EMPTY_ITEM) |
51 | |||
52 | if HEAVY_TESTS | ||
53 | THREAD_ONLY_TESTS += \ | ||
54 | test_concurrent_stop \ | ||
55 | $(EMPTY_ITEM) | ||
56 | endif | ||
35 | 57 | ||
36 | if HAVE_CURL_BINARY | 58 | if HAVE_CURL_BINARY |
37 | THREAD_ONLY_TESTS += \ | 59 | THREAD_ONLY_TESTS += \ |
@@ -46,11 +68,13 @@ THREAD_ONLY_TESTS += \ | |||
46 | test_digestauth_with_arguments | 68 | test_digestauth_with_arguments |
47 | endif | 69 | endif |
48 | 70 | ||
71 | if HEAVY_TESTS | ||
49 | if HAVE_POSIX_THREADS | 72 | if HAVE_POSIX_THREADS |
50 | THREAD_ONLY_TESTS += \ | 73 | THREAD_ONLY_TESTS += \ |
51 | perf_get_concurrent | 74 | perf_get_concurrent |
52 | endif | 75 | endif |
53 | 76 | endif | |
77 | |||
54 | if HAVE_CURL | 78 | if HAVE_CURL |
55 | check_PROGRAMS = \ | 79 | check_PROGRAMS = \ |
56 | test_get \ | 80 | test_get \ |
@@ -73,7 +97,12 @@ check_PROGRAMS = \ | |||
73 | test_get_chunked \ | 97 | test_get_chunked \ |
74 | test_put_chunked \ | 98 | test_put_chunked \ |
75 | test_callback \ | 99 | test_callback \ |
100 | $(EMPTY_ITEM) | ||
101 | |||
102 | if HEAVY_TESTS | ||
103 | check_PROGRAMS += \ | ||
76 | perf_get | 104 | perf_get |
105 | endif | ||
77 | 106 | ||
78 | if HAVE_POSTPROCESSOR | 107 | if HAVE_POSTPROCESSOR |
79 | check_PROGRAMS += \ | 108 | check_PROGRAMS += \ |
@@ -85,11 +114,13 @@ if HAVE_POSTPROCESSOR | |||
85 | test_post_loop11 | 114 | test_post_loop11 |
86 | endif | 115 | endif |
87 | 116 | ||
117 | if HEAVY_TESTS | ||
88 | if HAVE_FORK_WAITPID | 118 | if HAVE_FORK_WAITPID |
89 | if HAVE_CURL_BINARY | 119 | if HAVE_CURL_BINARY |
90 | check_PROGRAMS += test_get_response_cleanup | 120 | check_PROGRAMS += test_get_response_cleanup |
91 | endif | 121 | endif |
92 | endif | 122 | endif |
123 | endif | ||
93 | 124 | ||
94 | if USE_POSIX_THREADS | 125 | if USE_POSIX_THREADS |
95 | check_PROGRAMS += \ | 126 | check_PROGRAMS += \ |