On Monday 17 November 2003 18:47, Hans Leidekker wrote:
> > Which conformance tests fail currently? I don't see any problems with
> > the kernel DLL tests right at the moment, which is somewhat
> > disconcerting.
[sorry for those repeated mails, I received an error message from
my mailclient and concluded that the mail hadn't been sent]
I have looked into this a bit more and I think your confusion
stems from the fact that you run 'make test', which doesn't
run tests marked 'todo_wine'. When you run tests by hand e.g:
wine dlls/kernel/tests/kernel32_crosstest.exe directory
those tests will run (and fail).
Which reminds me that we should remove 'todo_wine' from this
test. Patch attached.
-Hans
Changelog:
- Remove 'todo_wine'
Index: dlls/kernel/tests/directory.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/directory.c,v
retrieving revision 1.7
diff -u -r1.7 directory.c
--- dlls/kernel/tests/directory.c 16 Sep 2003 01:19:21 -0000 1.7
+++ dlls/kernel/tests/directory.c 18 Nov 2003 13:19:37 -0000
@@ -193,21 +193,19 @@
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE, "RemoveDirectoryA should always succeed");
- todo_wine {
- lstrcatA(tmpdir, "?");
- ret = CreateDirectoryA(tmpdir, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryA with ? wildcard name should fail, ret=%s error=%ld",
- ret ? " True" : "False", GetLastError());
- ret = RemoveDirectoryA(tmpdir);
-
- tmpdir[lstrlenA(tmpdir) - 1] = '*';
- ret = CreateDirectoryA(tmpdir, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryA with * wildcard name should fail, ret=%s error=%ld",
- ret ? " True" : "False", GetLastError());
- ret = RemoveDirectoryA(tmpdir);
- }
+ lstrcatA(tmpdir, "?");
+ ret = CreateDirectoryA(tmpdir, NULL);
+ ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
+ "CreateDirectoryA with ? wildcard name should fail, ret=%s error=%ld",
+ ret ? " True" : "False", GetLastError());
+ ret = RemoveDirectoryA(tmpdir);
+
+ tmpdir[lstrlenA(tmpdir) - 1] = '*';
+ ret = CreateDirectoryA(tmpdir, NULL);
+ ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
+ "CreateDirectoryA with * wildcard name should fail, ret=%s error=%ld",
+ ret ? " True" : "False", GetLastError());
+ ret = RemoveDirectoryA(tmpdir);
}
static void test_CreateDirectoryW(void)
@@ -256,21 +254,19 @@
ret = RemoveDirectoryW(tmpdir);
ok(ret == TRUE, "RemoveDirectoryW should always succeed");
- todo_wine {
- lstrcatW(tmpdir, questionW);
- ret = CreateDirectoryW(tmpdir, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryW with ? wildcard name should fail with error 183, ret=%s error=%ld",
- ret ? " True" : "False", GetLastError());
- ret = RemoveDirectoryW(tmpdir);
-
- tmpdir[lstrlenW(tmpdir) - 1] = '*';
- ret = CreateDirectoryW(tmpdir, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld",
- ret ? " True" : "False", GetLastError());
- ret = RemoveDirectoryW(tmpdir);
- }
+ lstrcatW(tmpdir, questionW);
+ ret = CreateDirectoryW(tmpdir, NULL);
+ ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
+ "CreateDirectoryW with ? wildcard name should fail with error 183, ret=%s error=%ld",
+ ret ? " True" : "False", GetLastError());
+ ret = RemoveDirectoryW(tmpdir);
+
+ tmpdir[lstrlenW(tmpdir) - 1] = '*';
+ ret = CreateDirectoryW(tmpdir, NULL);
+ ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
+ "CreateDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld",
+ ret ? " True" : "False", GetLastError());
+ ret = RemoveDirectoryW(tmpdir);
}
static void test_RemoveDirectoryA(void)
@@ -286,19 +282,17 @@
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE, "RemoveDirectoryA should always succeed");
- todo_wine {
- 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",
- 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",
- ret ? " True" : "False", GetLastError());
- }
+ 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",
+ 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",
+ ret ? " True" : "False", GetLastError());
}
static void test_RemoveDirectoryW(void)
@@ -316,19 +310,17 @@
ret = RemoveDirectoryW(tmpdir);
ok(ret == TRUE, "RemoveDirectoryW should always succeed");
- todo_wine {
- lstrcatW(tmpdir, questionW);
- ret = RemoveDirectoryW(tmpdir);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryW with wildcard should fail with error 183, ret=%s error=%ld",
- ret ? " True" : "False", GetLastError());
-
- tmpdir[lstrlenW(tmpdir) - 1] = '*';
- ret = RemoveDirectoryW(tmpdir);
- ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld",
- ret ? " True" : "False", GetLastError());
- }
+ lstrcatW(tmpdir, questionW);
+ ret = RemoveDirectoryW(tmpdir);
+ ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
+ "RemoveDirectoryW with wildcard should fail with error 183, ret=%s error=%ld",
+ ret ? " True" : "False", GetLastError());
+
+ tmpdir[lstrlenW(tmpdir) - 1] = '*';
+ ret = RemoveDirectoryW(tmpdir);
+ ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
+ "RemoveDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld",
+ ret ? " True" : "False", GetLastError());
}
