Module: wine Branch: master Commit: 5735e2fafd9aefebbd31ef04f2414fa04aa11419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5735e2fafd9aefebbd31ef04f2...
Author: James Hawkins truiken@gmail.com Date: Wed Feb 25 20:15:31 2009 -0800
msi: Fix a failing test on win9x.
---
dlls/msi/tests/install.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 95dd03a..601b0f7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4628,10 +4628,15 @@ static void test_missingcab(void) create_pf_data("msitest\caesar", "abcdefgh", TRUE);
r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\augustus", TRUE), "File not installed\n"); + ok(r == ERROR_SUCCESS || + broken(r == ERROR_INSTALL_FAILURE), /* win9x */ + "Expected ERROR_SUCCESS, got %u\n", r); + if (r == ERROR_SUCCESS) + { + ok(delete_pf("msitest\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\maximus", TRUE), "File not installed\n"); + } ok(delete_pf("msitest\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest\maximus", TRUE), "File not installed\n"); ok(!delete_pf("msitest\gaius", TRUE), "File installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");