Module: wine Branch: master Commit: 6a6c8e3ee2f887f598e6704bcdd62eefe8e01a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6c8e3ee2f887f598e6704bcd...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Wed Feb 10 08:30:06 2010 +0100
shell32/tests: Fix a test failure on NT4.
---
dlls/shell32/tests/shlfileop.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 49ef8cb..777801e 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1728,9 +1728,12 @@ static void test_copy(void) shfo.pTo = "\0"; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(retval == ERROR_SUCCESS || + broken(retval == DE_OPCANCELLED), /* NT4 */ + "Expected ERROR_SUCCESS, got %d\n", retval); + if (retval == ERROR_SUCCESS) + ok(DeleteFileA("abcdefgh.abc"), "Expected file to exist\n"); ok(DeleteFileA("dir\abcdefgh.abc"), "Expected file to exist\n"); - ok(DeleteFileA("abcdefgh.abc"), "Expected file to exist\n"); ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); }