Hugh McMaster : reg/tests: Delete the export file before returning from compare_export().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e426c353fa9a025b324a6a80231970198edf2f13
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e426c353fa9a025b324a6a8023...

Author: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Date:   Fri Oct 13 08:15:27 2017 +0000

reg/tests: Delete the export file before returning from compare_export().

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 programs/reg/tests/reg.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c
index 12a1666..168a03d 100644
--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -4309,7 +4309,9 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp
 
     todo_wine_if (todo & TODO_REG_COMPARE)
         lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n");
-    ret = TRUE;
+
+    ret = DeleteFileA(filename);
+    todo_wine lok(ret, "DeleteFile failed: %u\n", GetLastError());
 
 exit:
     HeapFree(GetProcessHeap(), 0, fbuf);
@@ -4437,9 +4439,6 @@ static void test_export(void)
 
     todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n");
 
-    err = DeleteFileA("file.reg");
-    todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError());
-
     /* Test registry export with a simple data structure */
     dword = 0x100;
     add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword));
@@ -4449,9 +4448,6 @@ static void test_export(void)
     todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
     todo_wine ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n");
 
-    err = DeleteFileA("file.reg");
-    todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError());
-
     /* Test registry export with a complex data structure */
     add_key(hkey, "Subkey1", &subkey);
     add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4);
@@ -4490,9 +4486,6 @@ static void test_export(void)
     todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
     todo_wine ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n");
 
-    err = DeleteFileA("file.reg");
-    todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError());
-
     err = delete_tree(HKEY_CURRENT_USER, KEY_BASE);
     ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err);
 
@@ -4507,9 +4500,6 @@ static void test_export(void)
     todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
     todo_wine ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n");
 
-    err = DeleteFileA("file.reg");
-    todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError());
-
     delete_key(hkey, "Subkey1");
     delete_key(hkey, "Subkey2");
 
@@ -4525,9 +4515,6 @@ static void test_export(void)
     todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
     todo_wine ok(compare_export("file.reg", value_order_test, 0), "compare_export() failed\n");
 
-    err = DeleteFileA("file.reg");
-    todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError());
-
     delete_key(HKEY_CURRENT_USER, KEY_BASE);
 }