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

windows: fix environment_creation test

Browse Source 
abc945bc04 fails environment_creation test
This commit is contained in:
Shigeki Ohtsu 2012-08-29 11:14:36 +09:00 committed by Bert Belder
parent abc945bc04
commit 09faee40eb
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/test-spawn.c
View File

@ -667,7 +667,7 @@ TEST_IMPL(argument_escaping) {
return 0; return 0;
} }
WCHAR* make_program_env(char** env_block); uv_err_t make_program_env(char** env_block, WCHAR** dst_ptr);
TEST_IMPL(environment_creation) { TEST_IMPL(environment_creation) {
int i; int i;
@ -682,8 +682,9 @@ TEST_IMPL(environment_creation) {
WCHAR expected[512]; WCHAR expected[512];
WCHAR* ptr = expected; WCHAR* ptr = expected;
WCHAR* result; uv_err_t result;
WCHAR* str; WCHAR* str;
WCHAR* env;
for (i = 0; i < sizeof(environment) / sizeof(environment[0]) - 1; i++) { for (i = 0; i < sizeof(environment) / sizeof(environment[0]) - 1; i++) {
ptr += uv_utf8_to_utf16(environment[i], ptr, expected + sizeof(expected) - ptr); ptr += uv_utf8_to_utf16(environment[i], ptr, expected + sizeof(expected) - ptr);
@ -700,13 +701,14 @@ TEST_IMPL(environment_creation) {
++ptr; ++ptr;
*ptr = '\0'; *ptr = '\0';
result = make_program_env(environment); result = make_program_env(environment, &env);
ASSERT(result.code == UV_OK);
for (str = result; *str; str += wcslen(str) + 1) { for (str = env; *str; str += wcslen(str) + 1) {
wprintf(L"%s\n", str); wprintf(L"%s\n", str);
} }
ASSERT(wcscmp(expected, result) == 0); ASSERT(wcscmp(expected, env) == 0);
return 0; return 0;
} }