Commit 8503ad17 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

msi/tests: Run the package tests from a temporary directory.

parent 1b4b37cc
...@@ -9640,15 +9640,25 @@ static void test_top_level_action(void) ...@@ -9640,15 +9640,25 @@ static void test_top_level_action(void)
START_TEST(package) START_TEST(package)
{ {
char temp_path[MAX_PATH], prev_path[MAX_PATH];
STATEMGRSTATUS status; STATEMGRSTATUS status;
BOOL ret = FALSE; BOOL ret = FALSE;
DWORD len;
init_functionpointers(); init_functionpointers();
if (pIsWow64Process) if (pIsWow64Process)
pIsWow64Process(GetCurrentProcess(), &is_wow64); pIsWow64Process(GetCurrentProcess(), &is_wow64);
GetCurrentDirectoryA(MAX_PATH, CURR_DIR); GetCurrentDirectoryA(MAX_PATH, prev_path);
GetTempPathA(MAX_PATH, temp_path);
SetCurrentDirectoryA(temp_path);
lstrcpyA(CURR_DIR, temp_path);
len = lstrlenA(CURR_DIR);
if (len && (CURR_DIR[len - 1] == '\\'))
CURR_DIR[len - 1] = 0;
/* Create a restore point ourselves so we circumvent the multitude of restore points /* Create a restore point ourselves so we circumvent the multitude of restore points
* that would have been created by all the installation and removal tests. * that would have been created by all the installation and removal tests.
...@@ -9706,4 +9716,6 @@ START_TEST(package) ...@@ -9706,4 +9716,6 @@ START_TEST(package)
if (ret) if (ret)
remove_restore_point(status.llSequenceNumber); remove_restore_point(status.llSequenceNumber);
} }
SetCurrentDirectoryA(prev_path);
} }
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