Commit 9b6cf226 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

msi/tests: Make sure we only create one logfile.

parent 99069ab6
...@@ -5688,7 +5688,7 @@ static void test_propcase(void) ...@@ -5688,7 +5688,7 @@ static void test_propcase(void)
START_TEST(install) START_TEST(install)
{ {
DWORD len; DWORD len;
char temp_path[MAX_PATH], prev_path[MAX_PATH]; char temp_path[MAX_PATH], prev_path[MAX_PATH], log_file[MAX_PATH];
STATEMGRSTATUS status; STATEMGRSTATUS status;
BOOL ret = FALSE; BOOL ret = FALSE;
...@@ -5718,9 +5718,13 @@ START_TEST(install) ...@@ -5718,9 +5718,13 @@ START_TEST(install)
} }
/* Create only one log file and don't append. We have to pass something /* Create only one log file and don't append. We have to pass something
* for the log mode for this to work. * for the log mode for this to work. The logfile needs to have an absolute
* path otherwise we still end up with some extra logfiles as some tests
* change the current directory.
*/ */
MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, "msitest.log", 0); lstrcpyA(log_file, temp_path);
lstrcatA(log_file, "\\msitest.log");
MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, log_file, 0);
test_MsiInstallProduct(); test_MsiInstallProduct();
test_MsiSetComponentState(); test_MsiSetComponentState();
...@@ -5761,7 +5765,7 @@ START_TEST(install) ...@@ -5761,7 +5765,7 @@ START_TEST(install)
test_adminimage(); test_adminimage();
test_propcase(); test_propcase();
DeleteFileA("msitest.log"); DeleteFileA(log_file);
if (pSRSetRestorePointA && ret) if (pSRSetRestorePointA && ret)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment