Module: wine Branch: master Commit: cf36931614352d8e2495d5a583c74ed01c48b182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf36931614352d8e2495d5a583...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Aug 26 20:43:33 2008 +0200
ntdll/tests: Handle a couple of failures on NT4.
---
dlls/ntdll/tests/env.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 0480e7a..aab9368 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -155,7 +155,9 @@ static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATU ok(lstrcmpW(bval1, bval2) == 0, "Cannot get value written to environment\n"); break; case STATUS_VARIABLE_NOT_FOUND: - ok(val == NULL, "Couldn't find variable, but didn't delete it. val = %s\n", val); + ok(val == NULL || + broken(strchr(var,'=') != NULL), /* variable containing '=' may be set but not found again on NT4 */ + "Couldn't find variable, but didn't delete it. val = %s\n", val); break; default: ok(0, "Wrong ret %u for %s\n", nts, var); @@ -178,7 +180,7 @@ static void testSet(void) testSetHelper(&env, "cat", NULL, STATUS_SUCCESS, 0); testSetHelper(&env, "cat", NULL, STATUS_SUCCESS, STATUS_VARIABLE_NOT_FOUND); testSetHelper(&env, "foo", "meouw", STATUS_SUCCESS, 0); - testSetHelper(&env, "me=too", "also", STATUS_INVALID_PARAMETER, 0); + testSetHelper(&env, "me=too", "also", STATUS_SUCCESS, STATUS_INVALID_PARAMETER); testSetHelper(&env, "me", "too=also", STATUS_SUCCESS, 0); testSetHelper(&env, "=too", "also", STATUS_SUCCESS, 0); testSetHelper(&env, "=", "also", STATUS_SUCCESS, 0);