>From e4a0d7fe20fcbe87e8632c5bf10287c51de7173e Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Mon, 1 Dec 2008 11:13:13 +0100 Subject: [PATCH] Fix a test failure on Win9x --- dlls/shell32/tests/shlfileop.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index efe6507..df460d7 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -650,9 +650,12 @@ static void test_rename(void) shfo.pFrom = "test1.txt\0test2.txt\0"; shfo.pTo = "a.txt\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_GEN_FAILURE, "Expected ERROR_GEN_FAILURE, got %d\n", retval); + ok(retval == ERROR_GEN_FAILURE || + broken(!retval), /* Win9x */ + "Expected ERROR_GEN_FAILURE, got %d\n", retval); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); /* pFrom doesn't exist */ shfo.pFrom = "idontexist\0"; -- 1.6.0.4