msi: Fix a failing test in win9x.

acfc9159 · James Hawkins · Alexandre Julliard · d4e78458 · acfc9159
Commit acfc9159 authored Oct 24, 2008 by James Hawkins Committed by Alexandre Julliard Oct 24, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

db.c dlls/msi/tests/db.c +6 -1

No files found.
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -6864,7 +6864,12 @@ static void test_dbmerge(void)

    GetCurrentDirectoryA(MAX_PATH, buf);
    r = MsiDatabaseImportA(hdb, buf, "codepage.idt");
-    todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    todo_wine
+    {
+        ok(r == ERROR_SUCCESS ||
+           broken(r == ERROR_FUNCTION_FAILED), /* win9x */
+           "Expected ERROR_SUCCESS, got %d\n", r);
+    }

    query = "DROP TABLE `One`";
    r = run_query(hdb, 0, query);