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

win,test: fix shared library build

Browse Source 
Ifdef out the tests that rely on internal symbols when making a shared build.

PR-URL: https://github.com/libuv/libuv/pull/444
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Saúl Ibarra Corretgé 2015-07-15 23:04:22 +02:00
parent b3fde348e4
commit 01bbf6fb1c
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/test-list.h
View File

@ -303,8 +303,10 @@ TEST_DECLARE (ip6_addr_link_local)
TEST_DECLARE (poll_close_doesnt_corrupt_stack) TEST_DECLARE (poll_close_doesnt_corrupt_stack)
TEST_DECLARE (poll_closesocket) TEST_DECLARE (poll_closesocket)
TEST_DECLARE (spawn_detect_pipe_name_collisions_on_windows) TEST_DECLARE (spawn_detect_pipe_name_collisions_on_windows)
#if !defined(USING_UV_SHARED)
TEST_DECLARE (argument_escaping) TEST_DECLARE (argument_escaping)
TEST_DECLARE (environment_creation) TEST_DECLARE (environment_creation)
#endif
TEST_DECLARE (listen_with_simultaneous_accepts) TEST_DECLARE (listen_with_simultaneous_accepts)
TEST_DECLARE (listen_no_simultaneous_accepts) TEST_DECLARE (listen_no_simultaneous_accepts)
TEST_DECLARE (fs_stat_root) TEST_DECLARE (fs_stat_root)
@ -625,8 +627,10 @@ TASK_LIST_START
TEST_ENTRY (poll_close_doesnt_corrupt_stack) TEST_ENTRY (poll_close_doesnt_corrupt_stack)
TEST_ENTRY (poll_closesocket) TEST_ENTRY (poll_closesocket)
TEST_ENTRY (spawn_detect_pipe_name_collisions_on_windows) TEST_ENTRY (spawn_detect_pipe_name_collisions_on_windows)
#if !defined(USING_UV_SHARED)
TEST_ENTRY (argument_escaping) TEST_ENTRY (argument_escaping)
TEST_ENTRY (environment_creation) TEST_ENTRY (environment_creation)
# endif
TEST_ENTRY (listen_with_simultaneous_accepts) TEST_ENTRY (listen_with_simultaneous_accepts)
TEST_ENTRY (listen_no_simultaneous_accepts) TEST_ENTRY (listen_no_simultaneous_accepts)
TEST_ENTRY (fs_stat_root) TEST_ENTRY (fs_stat_root)

2
test/test-spawn.c
View File

@ -994,6 +994,7 @@ TEST_IMPL(spawn_detect_pipe_name_collisions_on_windows) {
} }
#if !defined(USING_UV_SHARED)
int make_program_args(char** args, int verbatim_arguments, WCHAR** dst_ptr); int make_program_args(char** args, int verbatim_arguments, WCHAR** dst_ptr);
WCHAR* quote_cmd_arg(const WCHAR *source, WCHAR *target); WCHAR* quote_cmd_arg(const WCHAR *source, WCHAR *target);
@ -1196,6 +1197,7 @@ TEST_IMPL(environment_creation) {
return 0; return 0;
} }
#endif
/* Regression test for issue #909 */ /* Regression test for issue #909 */
TEST_IMPL(spawn_with_an_odd_path) { TEST_IMPL(spawn_with_an_odd_path) {

8
uv.gyp
View File

@ -430,6 +430,9 @@
'_XOPEN_SOURCE=500', '_XOPEN_SOURCE=500',
], ],
}], }],
['uv_library=="shared_library"', {
'defines': [ 'USING_UV_SHARED=1' ]
}],
], ],
'msvs-settings': { 'msvs-settings': {
'VCLinkerTool': { 'VCLinkerTool': {
@ -481,7 +484,10 @@
'test/runner-unix.c', 'test/runner-unix.c',
'test/runner-unix.h', 'test/runner-unix.h',
] ]
}] }],
['uv_library=="shared_library"', {
'defines': [ 'USING_UV_SHARED=1' ]
}],
], ],
'msvs-settings': { 'msvs-settings': {
'VCLinkerTool': { 'VCLinkerTool': {