James Hawkins : msi: Skip the endlines test if the table fails on import.

Alexandre Julliard julliard at winehq.org
Tue Mar 18 07:44:42 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Mon Mar 17 12:16:03 2008 -0500

msi: Skip the endlines test if the table fails on import.

---

 dlls/msi/tests/db.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index ebcdc77..5bb049d 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -1643,7 +1643,12 @@ static void test_msiimport(void)
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
 
     r = add_table_to_db(hdb, endlines1);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    if (r == ERROR_FUNCTION_FAILED)
+    {
+        /* win9x doesn't handle this case */
+        skip("endlines not handled correctly.\n");
+        return;
+    }
 
     r = add_table_to_db(hdb, endlines2);
     ok(r == ERROR_FUNCTION_FAILED,




More information about the wine-cvs mailing list