[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35723 - libmicrohttpd/src/testcurl
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r35723 - libmicrohttpd/src/testcurl |
|
Date: |
Thu, 7 May 2015 19:04:37 +0200 |
Author: Karlson2k
Date: 2015-05-07 19:04:37 +0200 (Thu, 07 May 2015)
New Revision: 35723
Modified:
libmicrohttpd/src/testcurl/perf_get.c
libmicrohttpd/src/testcurl/test_get.c
libmicrohttpd/src/testcurl/test_quiesce.c
libmicrohttpd/src/testcurl/test_start_stop.c
Log:
tests: replace '#ifdefs' with 'MHD_is_feature_supported()'
Modified: libmicrohttpd/src/testcurl/perf_get.c
===================================================================
--- libmicrohttpd/src/testcurl/perf_get.c 2015-05-07 17:04:27 UTC (rev
35722)
+++ libmicrohttpd/src/testcurl/perf_get.c 2015-05-07 17:04:37 UTC (rev
35723)
@@ -513,15 +513,17 @@
errorCount += testInternalGet (port++, 0);
errorCount += testMultithreadedGet (port++, 0);
errorCount += testMultithreadedPoolGet (port++, 0);
-#ifndef WINDOWS
- errorCount += testInternalGet (port++, MHD_USE_POLL);
- errorCount += testMultithreadedGet (port++, MHD_USE_POLL);
- errorCount += testMultithreadedPoolGet (port++, MHD_USE_POLL);
-#endif
-#if EPOLL_SUPPORT
- errorCount += testInternalGet (port++, MHD_USE_EPOLL_LINUX_ONLY);
- errorCount += testMultithreadedPoolGet (port++, MHD_USE_EPOLL_LINUX_ONLY);
-#endif
+ if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL))
+ {
+ errorCount += testInternalGet(port++, MHD_USE_POLL);
+ errorCount += testMultithreadedGet(port++, MHD_USE_POLL);
+ errorCount += testMultithreadedPoolGet(port++, MHD_USE_POLL);
+ }
+ if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL))
+ {
+ errorCount += testInternalGet(port++, MHD_USE_EPOLL_LINUX_ONLY);
+ errorCount += testMultithreadedPoolGet(port++, MHD_USE_EPOLL_LINUX_ONLY);
+ }
MHD_destroy_response (response);
if (errorCount != 0)
fprintf (stderr, "Error (code: %u)\n", errorCount);
Modified: libmicrohttpd/src/testcurl/test_get.c
===================================================================
--- libmicrohttpd/src/testcurl/test_get.c 2015-05-07 17:04:27 UTC (rev
35722)
+++ libmicrohttpd/src/testcurl/test_get.c 2015-05-07 17:04:37 UTC (rev
35723)
@@ -617,20 +617,22 @@
errorCount += testStopRace (0);
errorCount += testExternalGet ();
errorCount += testEmptyGet (0);
-#ifndef WINDOWS
- errorCount += testInternalGet (MHD_USE_POLL);
- errorCount += testMultithreadedGet (MHD_USE_POLL);
- errorCount += testMultithreadedPoolGet (MHD_USE_POLL);
- errorCount += testUnknownPortGet (MHD_USE_POLL);
- errorCount += testStopRace (MHD_USE_POLL);
- errorCount += testEmptyGet (MHD_USE_POLL);
-#endif
-#if EPOLL_SUPPORT
- errorCount += testInternalGet (MHD_USE_EPOLL_LINUX_ONLY);
- errorCount += testMultithreadedPoolGet (MHD_USE_EPOLL_LINUX_ONLY);
- errorCount += testUnknownPortGet (MHD_USE_EPOLL_LINUX_ONLY);
- errorCount += testEmptyGet (MHD_USE_EPOLL_LINUX_ONLY);
-#endif
+ if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL))
+ {
+ errorCount += testInternalGet(MHD_USE_POLL);
+ errorCount += testMultithreadedGet(MHD_USE_POLL);
+ errorCount += testMultithreadedPoolGet(MHD_USE_POLL);
+ errorCount += testUnknownPortGet(MHD_USE_POLL);
+ errorCount += testStopRace(MHD_USE_POLL);
+ errorCount += testEmptyGet(MHD_USE_POLL);
+ }
+ if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL))
+ {
+ errorCount += testInternalGet(MHD_USE_EPOLL_LINUX_ONLY);
+ errorCount += testMultithreadedPoolGet(MHD_USE_EPOLL_LINUX_ONLY);
+ errorCount += testUnknownPortGet(MHD_USE_EPOLL_LINUX_ONLY);
+ errorCount += testEmptyGet(MHD_USE_EPOLL_LINUX_ONLY);
+ }
if (errorCount != 0)
fprintf (stderr, "Error (code: %u)\n", errorCount);
curl_global_cleanup ();
Modified: libmicrohttpd/src/testcurl/test_quiesce.c
===================================================================
--- libmicrohttpd/src/testcurl/test_quiesce.c 2015-05-07 17:04:27 UTC (rev
35722)
+++ libmicrohttpd/src/testcurl/test_quiesce.c 2015-05-07 17:04:37 UTC (rev
35723)
@@ -439,15 +439,17 @@
errorCount += testGet (MHD_USE_THREAD_PER_CONNECTION, 0, 0);
errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT, 0);
errorCount += testExternalGet ();
-#ifndef WINDOWS
- errorCount += testGet (MHD_USE_SELECT_INTERNALLY, 0, MHD_USE_POLL);
- errorCount += testGet (MHD_USE_THREAD_PER_CONNECTION, 0, MHD_USE_POLL);
- errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT, MHD_USE_POLL);
-#endif
-#if EPOLL_SUPPORT
- errorCount += testGet (MHD_USE_SELECT_INTERNALLY, 0,
MHD_USE_EPOLL_LINUX_ONLY);
- errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT,
MHD_USE_EPOLL_LINUX_ONLY);
-#endif
+ if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL))
+ {
+ errorCount += testGet(MHD_USE_SELECT_INTERNALLY, 0, MHD_USE_POLL);
+ errorCount += testGet (MHD_USE_THREAD_PER_CONNECTION, 0, MHD_USE_POLL);
+ errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT,
MHD_USE_POLL);
+ }
+ if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL))
+ {
+ errorCount += testGet (MHD_USE_SELECT_INTERNALLY, 0,
MHD_USE_EPOLL_LINUX_ONLY);
+ errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT,
MHD_USE_EPOLL_LINUX_ONLY);
+ }
if (errorCount != 0)
fprintf (stderr, "Error (code: %u)\n", errorCount);
curl_global_cleanup ();
Modified: libmicrohttpd/src/testcurl/test_start_stop.c
===================================================================
--- libmicrohttpd/src/testcurl/test_start_stop.c 2015-05-07 17:04:27 UTC
(rev 35722)
+++ libmicrohttpd/src/testcurl/test_start_stop.c 2015-05-07 17:04:37 UTC
(rev 35723)
@@ -112,15 +112,17 @@
errorCount += testMultithreadedGet (0);
errorCount += testMultithreadedPoolGet (0);
errorCount += testExternalGet ();
-#ifndef WINDOWS
- errorCount += testInternalGet (MHD_USE_POLL);
- errorCount += testMultithreadedGet (MHD_USE_POLL);
- errorCount += testMultithreadedPoolGet (MHD_USE_POLL);
-#endif
-#if EPOLL_SUPPORT
- errorCount += testInternalGet (MHD_USE_EPOLL_LINUX_ONLY);
- errorCount += testMultithreadedPoolGet (MHD_USE_EPOLL_LINUX_ONLY);
-#endif
+ if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL))
+ {
+ errorCount += testInternalGet(MHD_USE_POLL);
+ errorCount += testMultithreadedGet(MHD_USE_POLL);
+ errorCount += testMultithreadedPoolGet(MHD_USE_POLL);
+ }
+ if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL))
+ {
+ errorCount += testInternalGet(MHD_USE_EPOLL_LINUX_ONLY);
+ errorCount += testMultithreadedPoolGet(MHD_USE_EPOLL_LINUX_ONLY);
+ }
if (errorCount != 0)
fprintf (stderr, "Error (code: %u)\n", errorCount);
return errorCount != 0; /* 0 == pass */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35723 - libmicrohttpd/src/testcurl,
gnunet <=