[tests] fix directory tests
Dimitrie O. Paun
dpaun at rogers.com
Fri Jun 4 00:09:26 CDT 2004
ChangeLog
In Win9x, {Create,Remove}Directory returns ERROR_PATH_NOT_FOUND
when given directories containing '*' or '?'.
Index: dlls/kernel/tests/directory.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/tests/directory.c,v
retrieving revision 1.10
diff -u -r1.10 directory.c
--- dlls/kernel/tests/directory.c 27 Apr 2004 02:27:47 -0000 1.10
+++ dlls/kernel/tests/directory.c 4 Jun 2004 01:11:33 -0000
@@ -195,14 +195,16 @@
lstrcatA(tmpdir, "?");
ret = CreateDirectoryA(tmpdir, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
+ ok(ret == FALSE && (GetLastError() == ERROR_INVALID_NAME ||
+ GetLastError() == ERROR_PATH_NOT_FOUND),
"CreateDirectoryA with ? wildcard name should fail, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
ret = RemoveDirectoryA(tmpdir);
tmpdir[lstrlenA(tmpdir) - 1] = '*';
ret = CreateDirectoryA(tmpdir, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
+ ok(ret == FALSE && (GetLastError() == ERROR_INVALID_NAME ||
+ GetLastError() == ERROR_PATH_NOT_FOUND),
"CreateDirectoryA with * wildcard name should fail, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
ret = RemoveDirectoryA(tmpdir);
@@ -284,14 +286,16 @@
lstrcatA(tmpdir, "?");
ret = RemoveDirectoryA(tmpdir);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryA with ? wildcard name should fail with error 183, ret=%s error=%ld\n",
+ ok(ret == FALSE && (GetLastError() == ERROR_INVALID_NAME ||
+ GetLastError() == ERROR_PATH_NOT_FOUND),
+ "RemoveDirectoryA with ? wildcard name should fail, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
tmpdir[lstrlenA(tmpdir) - 1] = '*';
ret = RemoveDirectoryA(tmpdir);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryA with * wildcard name should fail with error 183, ret=%s error=%ld\n",
+ ok(ret == FALSE && (GetLastError() == ERROR_INVALID_NAME ||
+ GetLastError() == ERROR_PATH_NOT_FOUND),
+ "RemoveDirectoryA with * wildcard name should fail, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
}
More information about the wine-patches
mailing list