[PATCH 1/3] reg/tests: Reorder failing 'query' tests
Hugh McMaster
hugh.mcmaster at outlook.com
Wed Apr 14 07:47:39 CDT 2021
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/reg/tests/query.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c
index e2b438f8c92..3ae79d05524 100644
--- a/programs/reg/tests/query.c
+++ b/programs/reg/tests/query.c
@@ -47,24 +47,33 @@ static void test_query(void)
/* Create a test key */
add_key(HKEY_CURRENT_USER, KEY_BASE, &key);
+ add_value(key, "Test", REG_SZ, hello, sizeof(hello));
+ add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1));
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /v Wine", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /ve", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r);
ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),
"got exit code %d, expected 0\n", r);
- add_value(key, "Test", REG_SZ, hello, sizeof(hello));
- add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1));
add_value(key, NULL, REG_SZ, empty1, sizeof(empty1));
run_reg_exe("reg query HKCU\\" KEY_BASE, &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
@@ -74,12 +83,6 @@ static void test_query(void)
run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /v Wine", &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /ve", &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
/* Create a test subkey */
add_key(key, "Subkey", &subkey);
add_value(subkey, "Test", REG_SZ, world, sizeof(world));
@@ -116,9 +119,6 @@ static void test_query(void)
ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,
"got exit code %d, expected 0\n", r);
- run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
/* Clean-up, then query */
delete_key(key, "subkey");
close_key(key);
--
2.31.0
More information about the wine-devel
mailing list