James Hawkins : shell32: Fix a test that fails in win2k3.
Alexandre Julliard
julliard at winehq.org
Thu Apr 24 06:23:30 CDT 2008
Module: wine
Branch: master
Commit: 9ba8989026231b034bc4f91061671bf87263e9f6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba8989026231b034bc4f91061671bf87263e9f6
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Wed Apr 23 18:45:49 2008 -0500
shell32: Fix a test that fails in win2k3.
---
dlls/shell32/tests/shlfileop.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index e940c86..df4bd41 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -963,7 +963,9 @@ static void test_copy(void)
shfo.fFlags = FOF_MULTIDESTFILES | FOF_NOCONFIRMATION |
FOF_SILENT | FOF_NOERRORUI;
retval = SHFileOperation(&shfo);
- ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval);
+ ok(retval == ERROR_CANCELLED ||
+ retval == ERROR_SUCCESS, /* win2k3 */
+ "Expected ERROR_CANCELLED or ERROR_SUCCESS, got %d\n", retval);
ok(!DeleteFileA("threedir\\one.txt"), "Expected file to not exist\n");
ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n");
ok(DeleteFileA("one.txt"), "Expected file to exist\n");
More information about the wine-cvs
mailing list