3 files changed, 22 insertions, 2 deletions

diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index e1a5f402..4053e536 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -4,6 +4,8 @@ if USE_COVERAGE
   AM_CFLAGS = --coverage
 endif
 
+CPU_COUNT_DEF = -DCPU_COUNT=$(CPU_COUNT)
+
 AM_CPPFLAGS = \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)/src/microhttpd \
@@ -59,6 +61,8 @@ test_tls_options_LDADD = \
 test_https_get_parallel_SOURCES = \
   test_https_get_parallel.c \
   tls_test_common.c
+test_https_get_parallel_CPPFLAGS = \
+  $(AM_CPPFLAGS) $(CPU_COUNT_DEF)
 test_https_get_parallel_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_https_get_parallel_LDADD = \
@@ -77,6 +81,8 @@ test_empty_response_LDADD = \
 test_https_get_parallel_threads_SOURCES = \
   test_https_get_parallel_threads.c \
   tls_test_common.c
+test_https_get_parallel_threads_CPPFLAGS = \
+  $(AM_CPPFLAGS) $(CPU_COUNT_DEF)
 test_https_get_parallel_threads_CFLAGS = \
   $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 test_https_get_parallel_threads_LDADD = \
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c
index 9ac330f0..eafc3d26 100644
--- a/src/testcurl/https/test_https_get_parallel.c
+++ b/src/testcurl/https/test_https_get_parallel.c
@@ -33,6 +33,13 @@
 #include <gcrypt.h>
 #include "tls_test_common.h"
 
+#if defined(CPU_COUNT) && (CPU_COUNT+0) < 4
+#undef CPU_COUNT
+#endif
+#if !defined(CPU_COUNT)
+#define CPU_COUNT 4
+#endif
+
 extern const char srv_key_pem[];
 extern const char srv_self_signed_cert_pem[];
 
@@ -94,7 +101,7 @@ test_parallel_clients (void * cls, const char *cipher_suite,
                        int curl_proto_version)
 {
   int i;
-  int client_count = 3;
+  int client_count = (CPU_COUNT - 1);
   void *client_thread_ret;
   pthread_t client_arr[client_count];
   struct https_test_data client_args =
diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c
index 4e27370b..334276a3 100644
--- a/src/testcurl/https/test_https_get_parallel_threads.c
+++ b/src/testcurl/https/test_https_get_parallel_threads.c
@@ -35,6 +35,13 @@
 #include <gcrypt.h>
 #include "tls_test_common.h"
 
+#if defined(CPU_COUNT) && (CPU_COUNT+0) < 4
+#undef CPU_COUNT
+#endif
+#if !defined(CPU_COUNT)
+#define CPU_COUNT 4
+#endif
+
 extern const char srv_key_pem[];
 extern const char srv_self_signed_cert_pem[];
 
@@ -94,7 +101,7 @@ test_parallel_clients (void *cls, const char *cipher_suite,
                        int curl_proto_version)
 {
   int i;
-  int client_count = 3;
+  int client_count = (CPU_COUNT - 1);
   void *client_thread_ret;
   pthread_t client_arr[client_count];
   struct https_test_data client_args =