-do not run epoll tests if epoll was disabled, even on linux

This commit is contained in:
Christian Grothoff
2013-08-28 09:41:30 +00:00
parent 991598830f
commit a5f4e104cc
3 changed files with 5 additions and 3 deletions
+2
View File
@@ -1568,6 +1568,8 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
(struct sockaddr *) pos->addr,
pos->addr_len);
#if EPOLL_SUPPORT
if (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL))
MHD_PANIC ("Internal error");
if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) &&
(-1 != daemon->epoll_fd) &&
(0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EPOLL_SET)) )
+2 -2
View File
@@ -141,7 +141,7 @@ main (int argc, char *const *argv)
if (curl_uses_nss_ssl() == 0)
aes256_sha = "rsa_aes_256_sha";
#if LINUX
#if EPOLL_SUPPORT
errorCount +=
test_wrap ("single threaded daemon, single client, epoll", &test_single_client,
NULL,
@@ -157,7 +157,7 @@ main (int argc, char *const *argv)
aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
#if LINUX
#if EPOLL_SUPPORT
errorCount +=
test_wrap ("single threaded daemon, parallel clients, epoll",
&test_parallel_clients, NULL,
+1 -1
View File
@@ -221,7 +221,7 @@ main (int argc, char *const *argv)
fprintf (stderr, "Error: %s\n", strerror (errno));
return -1;
}
#if LINUX
#if EPOLL_SUPPORT
if (0 != (errorCount = testExternalGet (MHD_USE_EPOLL_LINUX_ONLY)))
fprintf (stderr, "Fail: %d\n", errorCount);
#endif