From: Zhenbo Li Subject: shell32: fix a test failure in shlfileop.c Message-Id: <543400E8.2080801@gmail.com> Date: Tue, 07 Oct 2014 23:04:08 +0800 I accidentally found that current code would fail on testbot[1]. However, the test results on test.winehq.org[2] showed that test on shell32:shlfileop works fine[2]. Could anyone have a look on my patch? Thank you. [1]: http://testbot.winehq.org/JobDetails.pl?Key=9330 [2]: http://test.winehq.org/data/tests/shell32:shlfileop.html --- dlls/shell32/tests/shlfileop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 51de635..8c1d66d 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -814,9 +814,10 @@ static void test_rename(void) retval = SHFileOperationA(&shfo); ok(retval == ERROR_CANCELLED || retval == DE_DIFFDIR || /* Vista */ + broken(retval == DE_FILEDESTISFLD) || /* Some Vista PCs */ broken(retval == DE_OPCANCELLED) || /* Win9x */ broken(retval == 65652), /* NT4 */ - "Expected ERROR_CANCELLED or DE_DIFFDIR\n"); + "Expected ERROR_CANCELLED or DE_DIFFDIR, got %d\n", retval); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* pFrom is empty */