luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: silence build warnings

Browse Source 
PR-URL: https://github.com/libuv/libuv/pull/893
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
This commit is contained in:
Kári Tristan Helgason 2016-05-30 08:36:36 +00:00 committed by Saúl Ibarra Corretgé
parent 71bd07e588
commit 89f01a41ab
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -128,7 +128,7 @@ EXTRA_DIST = test/fixtures/empty_file \
TESTS = test/run-tests TESTS = test/run-tests
check_PROGRAMS = test/run-tests check_PROGRAMS = test/run-tests
test_run_tests_CFLAGS = test_run_tests_CFLAGS = -Wno-long-long
test_run_tests_LDFLAGS = test_run_tests_LDFLAGS =
test_run_tests_SOURCES = test/blackhole-server.c \ test_run_tests_SOURCES = test/blackhole-server.c \
test/dns-server.c \ test/dns-server.c \

4
test/test-list.h
View File

@ -326,9 +326,9 @@ TEST_DECLARE (poll_nested_kqueue)
TEST_DECLARE (ip4_addr) TEST_DECLARE (ip4_addr)
TEST_DECLARE (ip6_addr_link_local) TEST_DECLARE (ip6_addr_link_local)
#ifdef _WIN32
TEST_DECLARE (poll_close_doesnt_corrupt_stack) TEST_DECLARE (poll_close_doesnt_corrupt_stack)
TEST_DECLARE (poll_closesocket) TEST_DECLARE (poll_closesocket)
#ifdef _WIN32
TEST_DECLARE (spawn_detect_pipe_name_collisions_on_windows) TEST_DECLARE (spawn_detect_pipe_name_collisions_on_windows)
#if !defined(USING_UV_SHARED) #if !defined(USING_UV_SHARED)
TEST_DECLARE (argument_escaping) TEST_DECLARE (argument_escaping)
@ -669,9 +669,9 @@ TASK_LIST_START
TEST_ENTRY (fs_poll_getpath) TEST_ENTRY (fs_poll_getpath)
TEST_ENTRY (kill) TEST_ENTRY (kill)
#ifdef _WIN32
TEST_ENTRY (poll_close_doesnt_corrupt_stack) TEST_ENTRY (poll_close_doesnt_corrupt_stack)
TEST_ENTRY (poll_closesocket) TEST_ENTRY (poll_closesocket)
#ifdef _WIN32
TEST_ENTRY (spawn_detect_pipe_name_collisions_on_windows) TEST_ENTRY (spawn_detect_pipe_name_collisions_on_windows)
#if !defined(USING_UV_SHARED) #if !defined(USING_UV_SHARED)
TEST_ENTRY (argument_escaping) TEST_ENTRY (argument_escaping)

2
test/test-platform-output.c
View File

@ -61,8 +61,6 @@ TEST_IMPL(platform_output) {
ASSERT(rusage.ru_utime.tv_usec >= 0); ASSERT(rusage.ru_utime.tv_usec >= 0);
ASSERT(rusage.ru_stime.tv_sec >= 0); ASSERT(rusage.ru_stime.tv_sec >= 0);
ASSERT(rusage.ru_stime.tv_usec >= 0); ASSERT(rusage.ru_stime.tv_usec >= 0);
ASSERT(rusage.ru_majflt >= 0);
ASSERT(rusage.ru_maxrss >= 0);
printf("uv_getrusage:\n"); printf("uv_getrusage:\n");
printf(" user: %llu sec %llu microsec\n", printf(" user: %llu sec %llu microsec\n",
(unsigned long long) rusage.ru_utime.tv_sec, (unsigned long long) rusage.ru_utime.tv_sec,

10
test/test-poll-close-doesnt-corrupt-stack.c
View File

@ -19,8 +19,6 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifdef _WIN32
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
@ -37,6 +35,7 @@
uv_os_sock_t sock; uv_os_sock_t sock;
uv_poll_t handle; uv_poll_t handle;
#ifdef _WIN32
static int close_cb_called = 0; static int close_cb_called = 0;
@ -69,9 +68,13 @@ static void NO_INLINE close_socket_and_verify_stack() {
for (i = 0; i < ARRAY_SIZE(data); i++) for (i = 0; i < ARRAY_SIZE(data); i++)
ASSERT(data[i] == MARKER); ASSERT(data[i] == MARKER);
} }
#endif
TEST_IMPL(poll_close_doesnt_corrupt_stack) { TEST_IMPL(poll_close_doesnt_corrupt_stack) {
#ifndef _WIN32
RETURN_SKIP("Test only relevant on Windows");
#else
struct WSAData wsa_data; struct WSAData wsa_data;
int r; int r;
unsigned long on; unsigned long on;
@ -109,6 +112,5 @@ TEST_IMPL(poll_close_doesnt_corrupt_stack) {
MAKE_VALGRIND_HAPPY(); MAKE_VALGRIND_HAPPY();
return 0; return 0;
#endif
} }
#endif /* _WIN32 */

8
test/test-poll-closesocket.c
View File

@ -19,7 +19,6 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifdef _WIN32
#include <errno.h> #include <errno.h>
@ -29,6 +28,7 @@
uv_os_sock_t sock; uv_os_sock_t sock;
uv_poll_t handle; uv_poll_t handle;
#ifdef _WIN32
static int close_cb_called = 0; static int close_cb_called = 0;
@ -50,9 +50,13 @@ static void poll_cb(uv_poll_t* h, int status, int events) {
uv_close((uv_handle_t*) &handle, close_cb); uv_close((uv_handle_t*) &handle, close_cb);
} }
#endif
TEST_IMPL(poll_closesocket) { TEST_IMPL(poll_closesocket) {
#ifndef _WIN32
RETURN_SKIP("Test only relevant on Windows");
#else
struct WSAData wsa_data; struct WSAData wsa_data;
int r; int r;
unsigned long on; unsigned long on;
@ -85,5 +89,5 @@ TEST_IMPL(poll_closesocket) {
MAKE_VALGRIND_HAPPY(); MAKE_VALGRIND_HAPPY();
return 0; return 0;
}
#endif #endif
}

1
uv.gyp
View File

@ -426,6 +426,7 @@
'libraries': [ '-lws2_32' ] 'libraries': [ '-lws2_32' ]
}, { # POSIX }, { # POSIX
'defines': [ '_GNU_SOURCE' ], 'defines': [ '_GNU_SOURCE' ],
'cflags': [ '-Wno-long-long' ],
'sources': [ 'sources': [
'test/runner-unix.c', 'test/runner-unix.c',
'test/runner-unix.h', 'test/runner-unix.h',