Skip to content

Commit b937f59

Browse files
committed
tests: Count succeeding tests marked as driver bugs separately
Currently all tests marked as driver bugs get counted as "bug" no matter if they succeed or fail. This makes it clearer how many of them actually fail.
1 parent 62dd0b2 commit b937f59

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

include/private/vkd3d_test.h

+12-4
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ struct vkd3d_test_state_context
112112
LONG todo_count;
113113
LONG todo_success_count;
114114
LONG bug_count;
115+
LONG bug_success_count;
115116

116117
unsigned int debug_level;
117118

@@ -180,13 +181,18 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg
180181

181182
if (is_bug && vkd3d_test_state.bug_enabled)
182183
{
183-
InterlockedIncrement(&vkd3d_test_state.bug_count);
184184
if (is_todo)
185185
result = !result;
186186
if (result)
187+
{
188+
InterlockedIncrement(&vkd3d_test_state.bug_success_count);
187189
printf("%s:%d%s: Fixed bug: ", vkd3d_test_name, line, vkd3d_test_state.context);
190+
}
188191
else
192+
{
193+
InterlockedIncrement(&vkd3d_test_state.bug_count);
189194
printf("%s:%d%s: Bug: ", vkd3d_test_name, line, vkd3d_test_state.context);
195+
}
190196
vprintf(fmt, args);
191197
fflush(stdout);
192198
}
@@ -314,18 +320,20 @@ int main(int argc, char **argv)
314320

315321
vkd3d_test_main(argc, argv);
316322

317-
printf("%s: %lu tests executed (%lu failures, %lu successful todo, %lu skipped, %lu todo, %lu bugs).\n",
323+
printf("%s: %lu tests executed (%lu failures, %lu successful todo, %lu skipped, %lu todo, %lu bugs, %lu successful bugs).\n",
318324
vkd3d_test_name,
319325
(unsigned long)(vkd3d_test_state.success_count
320326
+ vkd3d_test_state.failure_count
321327
+ vkd3d_test_state.todo_count
322328
+ vkd3d_test_state.todo_success_count
323-
+ vkd3d_test_state.bug_count),
329+
+ vkd3d_test_state.bug_count
330+
+ vkd3d_test_state.bug_success_count),
324331
(unsigned long)vkd3d_test_state.failure_count,
325332
(unsigned long)vkd3d_test_state.todo_success_count,
326333
(unsigned long)vkd3d_test_state.skip_count,
327334
(unsigned long)vkd3d_test_state.todo_count,
328-
(unsigned long)vkd3d_test_state.bug_count);
335+
(unsigned long)vkd3d_test_state.bug_count,
336+
(unsigned long)vkd3d_test_state.bug_success_count);
329337

330338
fflush(stdout);
331339
return vkd3d_test_state.failure_count != 0;

0 commit comments

Comments
 (0)