]> granicus.if.org Git - libevent/commitdiff
Disable logging for tests that assume printing warnings
authorAzat Khuzhin <azat@libevent.org>
Wed, 3 Apr 2019 04:26:21 +0000 (07:26 +0300)
committerAzat Khuzhin <azat@libevent.org>
Wed, 3 Apr 2019 05:00:12 +0000 (08:00 +0300)
To avoid possible confusion

But there is still one test that has some messages on windows:
  main/methods

Because this test needs >1 of avaiable methods, otherwise it will warn.

test/regress_bufferevent.c
test/regress_dns.c
test/regress_http.c
test/regress_listener.c

index 3ed48fae699f7419fe51a030d33fce6c7ff098cd..d4208c20905643a630b882f4f4b72315b4b7079b 100644 (file)
@@ -1338,7 +1338,7 @@ struct testcase_t bufferevent_testcases[] = {
        LEGACY(bufferevent_pair_flush_finished, TT_ISOLATED),
 #if defined(EVTHREAD_USE_PTHREADS_IMPLEMENTED)
        { "bufferevent_pair_release_lock", test_bufferevent_pair_release_lock,
-         TT_FORK|TT_ISOLATED|TT_NEED_THREADS|TT_NEED_BASE|TT_LEGACY,
+         TT_FORK|TT_ISOLATED|TT_NEED_THREADS|TT_NEED_BASE|TT_LEGACY|TT_NO_LOGS,
          &basic_setup, NULL },
 #endif
        LEGACY(bufferevent_watermarks, TT_ISOLATED),
index 25a5f5ac6974b392478b00b131df58f70bfaf989..76b0b86ae8d8e662cef3a9d71ac8bfb8bda9e3a1 100644 (file)
@@ -2383,7 +2383,7 @@ struct testcase_t dns_testcases[] = {
        { "disable_when_inactive", dns_disable_when_inactive_test,
          TT_FORK|TT_NEED_BASE, &basic_setup, NULL },
        { "disable_when_inactive_no_ns", dns_disable_when_inactive_no_ns_test,
-         TT_FORK|TT_NEED_BASE, &basic_setup, NULL },
+         TT_FORK|TT_NEED_BASE|TT_NO_LOGS, &basic_setup, NULL },
 
        { "initialize_nameservers", dns_initialize_nameservers_test,
          TT_FORK|TT_NEED_BASE, &basic_setup, NULL },
@@ -2411,10 +2411,10 @@ struct testcase_t dns_testcases[] = {
 #endif
 
        { "client_fail_requests", dns_client_fail_requests_test,
-         TT_FORK|TT_NEED_BASE, &basic_setup, NULL },
+         TT_FORK|TT_NEED_BASE|TT_NO_LOGS, &basic_setup, NULL },
        { "client_fail_requests_getaddrinfo",
          dns_client_fail_requests_getaddrinfo_test,
-         TT_FORK|TT_NEED_BASE, &basic_setup, NULL },
+         TT_FORK|TT_NEED_BASE|TT_NO_LOGS, &basic_setup, NULL },
 #ifdef EVTHREAD_USE_PTHREADS_IMPLEMENTED
        { "getaddrinfo_race_gotresolve",
          getaddrinfo_race_gotresolve_test,
index e29cd1b5a9546b627b8f7ccbe9e42c0222bfddbe..fdffee018ca5b9b1fa7b3a21d62e4d3d2e76ef9b 100644 (file)
@@ -5000,11 +5000,11 @@ http_timeout_read_server_test(void *arg)
 #define HTTP_CAST_ARG(a) ((void *)(a))
 #define HTTP_OFF_N(title, name, arg) \
        { #title, http_##name##_test, TT_ISOLATED|TT_OFF_BY_DEFAULT, &basic_setup, HTTP_CAST_ARG(arg) }
-#define HTTP_RET_N(title, name, arg) \
-       { #title, http_##name##_test, TT_ISOLATED|TT_RETRIABLE, &basic_setup, HTTP_CAST_ARG(arg) }
-#define HTTP_N(title, name, arg) \
-       { #title, http_##name##_test, TT_ISOLATED, &basic_setup, HTTP_CAST_ARG(arg) }
-#define HTTP(name) HTTP_N(name, name, NULL)
+#define HTTP_RET_N(title, name, test_opts, arg) \
+       { #title, http_##name##_test, TT_ISOLATED|TT_RETRIABLE|test_opts, &basic_setup, HTTP_CAST_ARG(arg) }
+#define HTTP_N(title, name, test_opts, arg) \
+       { #title, http_##name##_test, TT_ISOLATED|test_opts, &basic_setup, HTTP_CAST_ARG(arg) }
+#define HTTP(name) HTTP_N(name, name, 0, NULL)
 #define HTTPS(name) \
        { "https_" #name, https_##name##_test, TT_ISOLATED, &basic_setup, NULL }
 
@@ -5056,18 +5056,18 @@ struct testcase_t http_testcases[] = {
        HTTP(simple),
        HTTP(simple_nonconformant),
 
-       HTTP_N(cancel, cancel, BASIC),
-       HTTP_RET_N(cancel_by_host, cancel, BY_HOST),
-       HTTP_RET_N(cancel_by_host_inactive_server, cancel, BY_HOST | INACTIVE_SERVER),
-       HTTP_RET_N(cancel_by_host_no_ns, cancel, BY_HOST | NO_NS),
-       HTTP_N(cancel_inactive_server, cancel, INACTIVE_SERVER),
-       HTTP_N(cancel_by_host_no_ns_inactive_server, cancel, BY_HOST | NO_NS | INACTIVE_SERVER),
+       HTTP_N(cancel, cancel, 0, BASIC),
+       HTTP_RET_N(cancel_by_host, cancel, 0, BY_HOST),
+       HTTP_RET_N(cancel_by_host_inactive_server, cancel, TT_NO_LOGS, BY_HOST | INACTIVE_SERVER),
+       HTTP_RET_N(cancel_by_host_no_ns, cancel, TT_NO_LOGS, BY_HOST | NO_NS),
+       HTTP_N(cancel_inactive_server, cancel, 0, INACTIVE_SERVER),
+       HTTP_N(cancel_by_host_no_ns_inactive_server, cancel, TT_NO_LOGS, BY_HOST | NO_NS | INACTIVE_SERVER),
        HTTP_OFF_N(cancel_by_host_server_timeout, cancel, BY_HOST | INACTIVE_SERVER | SERVER_TIMEOUT),
        HTTP_OFF_N(cancel_server_timeout, cancel, INACTIVE_SERVER | SERVER_TIMEOUT),
        HTTP_OFF_N(cancel_by_host_no_ns_server_timeout, cancel, BY_HOST | NO_NS | INACTIVE_SERVER | SERVER_TIMEOUT),
        HTTP_OFF_N(cancel_by_host_ns_timeout_server_timeout, cancel, BY_HOST | NO_NS | NS_TIMEOUT | INACTIVE_SERVER | SERVER_TIMEOUT),
-       HTTP_RET_N(cancel_by_host_ns_timeout, cancel, BY_HOST | NO_NS | NS_TIMEOUT),
-       HTTP_RET_N(cancel_by_host_ns_timeout_inactive_server, cancel, BY_HOST | NO_NS | NS_TIMEOUT | INACTIVE_SERVER),
+       HTTP_RET_N(cancel_by_host_ns_timeout, cancel, TT_NO_LOGS, BY_HOST | NO_NS | NS_TIMEOUT),
+       HTTP_RET_N(cancel_by_host_ns_timeout_inactive_server, cancel, TT_NO_LOGS, BY_HOST | NO_NS | NS_TIMEOUT | INACTIVE_SERVER),
 
        HTTP(virtual_host),
        HTTP(post),
index b60529f2b1d3f7784ac718e65024fed81b9233a6..871da4c62ce927e50bbef92e487ca47f2ef3c5dc 100644 (file)
@@ -314,7 +314,7 @@ struct testcase_t listener_testcases[] = {
 
 #ifdef EVENT__HAVE_SETRLIMIT
        { "error_unlock", regress_listener_error_unlock,
-         TT_FORK|TT_NEED_BASE|TT_NEED_SOCKETPAIR,
+         TT_FORK|TT_NEED_BASE|TT_NEED_SOCKETPAIR|TT_NO_LOGS,
          &basic_setup, NULL},
 #endif