[msi/tests] Properly cleanup after each test

James Hawkins truiken at gmail.com
Tue May 8 15:32:06 CDT 2007


On 5/8/07, Paul Vriens <paul.vriens.wine at gmail.com> wrote:
> Hi,
>
> All files in the destination directory (usually 'Program Files') are cleaned up,
> but sometimes not the files/directories in the temp directory. We have to make
> sure we have a clean start for every test.
>
> I've also changed a filename from 'path' to a clearer one (me thinks).
>

-    CHAR path[MAX_PATH];
+    CHAR msifile2[MAX_PATH];

     CreateDirectoryA("msitest", NULL);
     CreateDirectoryA("msitest\\msitest", NULL);
@@ -1451,9 +1460,9 @@ static void test_concurrentinstall(void)

     create_database(msifile, ci_tables, sizeof(ci_tables) / sizeof(msi_table));

-    lstrcpyA(path, CURR_DIR);
-    lstrcatA(path, "\\msitest\\concurrent.msi");
-    create_database(path, ci2_tables, sizeof(ci2_tables) / sizeof(msi_table));
+    lstrcpyA(msifile2, CURR_DIR);
+    lstrcatA(msifile2, "\\msitest\\concurrent.msi");
+    create_database(msifile2, ci2_tables, sizeof(ci2_tables) /
sizeof(msi_table));

Please don't change the names of variables.  I chose the generic name
of path (which is used throught Wine), because that's exactly what the
variable contains throughout the functions.  Also, msifile2 is a poor
choice of a variable name.

Thanks,
James Hawkins



More information about the wine-devel mailing list