Paul Vriens : shell32/tests: Fix a test failure on Win9x.

Alexandre Julliard julliard at winehq.org
Mon Dec 1 07:34:10 CST 2008


Module: wine
Branch: master
Commit: e5779901c334b9dbc6aa4cfcfcfe166c2a90671f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e5779901c334b9dbc6aa4cfcfcfe166c2a90671f

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Mon Dec  1 11:13:13 2008 +0100

shell32/tests: 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";




More information about the wine-cvs mailing list