Paul Vriens : msi/tests: Properly cleanup after each test.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Mar 5 06:23:09 CST 2007
Module: wine
Branch: master
Commit: 6efffc3829f0b03c2dbcaa54ba84d26742e98dbb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6efffc3829f0b03c2dbcaa54ba84d26742e98dbb
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Fri Mar 2 17:04:46 2007 +0100
msi/tests: Properly cleanup after each test.
---
dlls/msi/tests/install.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 534a64a..08c7e2e 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -28,7 +28,7 @@
#include "wine/test.h"
-static const char *msifile = "winetest.msi";
+static const char *msifile = "msitest.msi";
CHAR CURR_DIR[MAX_PATH];
CHAR PROG_FILES_DIR[MAX_PATH];
@@ -964,7 +964,8 @@ static void delete_cab_files(void)
CHAR path[MAX_PATH];
lstrcpyA(path, CURR_DIR);
- lstrcatA(path, "\\*.cab\0");
+ lstrcatA(path, "\\*.cab");
+ path[strlen(path) + 1] = '\0';
shfl.hwnd = NULL;
shfl.wFunc = FO_DELETE;
@@ -1103,10 +1104,11 @@ static void test_mixedmedia(void)
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n");
- DeleteFile("maximus");
- DeleteFile("augustus");
- DeleteFile("caesar");
+ /* Delete the files in the temp (current) folder */
+ DeleteFile("msitest\\maximus");
+ DeleteFile("msitest\\augustus");
RemoveDirectory("msitest");
+ DeleteFile("caesar");
DeleteFile("test1.cab");
DeleteFile(msifile);
}
@@ -1204,6 +1206,9 @@ static void test_readonlyfile(void)
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n");
+ /* Delete the files in the temp (current) folder */
+ DeleteFile("msitest\\maximus");
+ RemoveDirectory("msitest");
DeleteFile(msifile);
}
More information about the wine-cvs
mailing list