[PATCH 01/10] ntoskrnl.exe/tests: Reduce the verbosity of test_return_status.

Rémi Bernon rbernon at codeweavers.com
Thu Sep 2 02:24:15 CDT 2021


Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---

Looks like my attempt to move driver tests around will need some thought
so I'm sending the HID tests changes in ntoskrnl.exe/tests instead, as
there'll be exhibiting a few things that need fixing.

Also sending a few ntoskrnl.exe tests improvements to fix a few
potential spurious failures, especially when running the tests several
times, where there's sometimes stale devices laying around.

I'll probably then duplicate the code for DInput driver-based tests.

The first patch may just be skipped, otherwise Marvin was going to
complain on every other patch.

 dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
index dc10497caee..e3afd46181c 100644
--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -946,7 +946,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params)
 static void test_return_status(void)
 {
     struct return_status_params params;
-    unsigned int i, j, k;
+    unsigned int i, j, k, old_threshold;
 
     static const ULONG method_tests[] =
     {
@@ -979,12 +979,15 @@ static void test_return_status(void)
                     params.ret_status = status_tests[i];
                     params.iosb_status = status_tests[j];
 
-                    winetest_push_context("return 0x%08x, iosb 0x%08x, pending %d, method %u",
-                            params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3);
+                    trace("testing return 0x%08x, iosb 0x%08x, pending %d, method %u\n",
+                          params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3);
+                    old_threshold = winetest_mute_threshold;
+                    winetest_mute_threshold = 1;
 
                     do_return_status(method_tests[k], &params);
 
-                    winetest_pop_context();
+                    winetest_mute_threshold = old_threshold;
+                    trace("done\n");
                 }
             }
         }
-- 
2.33.0




More information about the wine-devel mailing list