diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-03-14 16:06:13 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-03-14 16:06:13 +0100 |
| commit | 2e8a4f8b9a521f94e8b00c15dba458493892a685 (patch) | |
| tree | 0137d2ef537d7a60317831c95145e004ce8eedac /src/testcurl | |
| parent | 7078145599b9d3b77b361de2797d704e9346fb5d (diff) | |
| download | libmicrohttpd-2e8a4f8b9a521f94e8b00c15dba458493892a685.tar.gz libmicrohttpd-2e8a4f8b9a521f94e8b00c15dba458493892a685.zip | |
mark build as non-parallel due to port conflicts (#6117)
Diffstat (limited to 'src/testcurl')
| -rw-r--r-- | src/testcurl/Makefile.am | 2 | ||||
| -rw-r--r-- | src/testcurl/https/Makefile.am | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am index b1b85247..511a4c13 100644 --- a/src/testcurl/Makefile.am +++ b/src/testcurl/Makefile.am | |||
| @@ -25,7 +25,7 @@ THREAD_ONLY_TESTS = \ | |||
| 25 | test_termination \ | 25 | test_termination \ |
| 26 | test_timeout | 26 | test_timeout |
| 27 | 27 | ||
| 28 | 28 | .NOTPARALLEL: | |
| 29 | 29 | ||
| 30 | if HAVE_POSIX_THREADS | 30 | if HAVE_POSIX_THREADS |
| 31 | THREAD_ONLY_TESTS += \ | 31 | THREAD_ONLY_TESTS += \ |
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am index 2ea8e2d7..fd7f3964 100644 --- a/src/testcurl/https/Makefile.am +++ b/src/testcurl/https/Makefile.am | |||
| @@ -15,6 +15,8 @@ if HAVE_POSIX_THREADS | |||
| 15 | test_https_get_parallel_threads | 15 | test_https_get_parallel_threads |
| 16 | endif | 16 | endif |
| 17 | 17 | ||
| 18 | .NOTPARALLEL: | ||
| 19 | |||
| 18 | CPU_COUNT_DEF = -DCPU_COUNT=$(CPU_COUNT) | 20 | CPU_COUNT_DEF = -DCPU_COUNT=$(CPU_COUNT) |
| 19 | 21 | ||
| 20 | AM_CPPFLAGS = \ | 22 | AM_CPPFLAGS = \ |
| @@ -35,7 +37,7 @@ THREAD_ONLY_TESTS = \ | |||
| 35 | test_empty_response | 37 | test_empty_response |
| 36 | 38 | ||
| 37 | check_PROGRAMS = \ | 39 | check_PROGRAMS = \ |
| 38 | test_https_get_select | 40 | test_https_get_select |
| 39 | 41 | ||
| 40 | if USE_POSIX_THREADS | 42 | if USE_POSIX_THREADS |
| 41 | check_PROGRAMS += \ | 43 | check_PROGRAMS += \ |
| @@ -177,4 +179,3 @@ test_https_get_select_LDADD = \ | |||
| 177 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 179 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
| 178 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 180 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
| 179 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 181 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
| 180 | |||