Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve accounting of tests marked as driver bugs #2177

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions include/private/vkd3d_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ struct vkd3d_test_state_context
LONG todo_count;
LONG todo_success_count;
LONG bug_count;
LONG bug_fixed_count;

unsigned int debug_level;

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

if (is_bug && vkd3d_test_state.bug_enabled)
{
InterlockedIncrement(&vkd3d_test_state.bug_count);
if (is_todo)
result = !result;
if (result)
printf("%s:%d%s: Fixed bug: ", vkd3d_test_name, line, vkd3d_test_state.context);
{
InterlockedIncrement(&vkd3d_test_state.bug_fixed_count);
printf("%s:%d%s: Fixed driver bug: ", vkd3d_test_name, line, vkd3d_test_state.context);
}
else
printf("%s:%d%s: Bug: ", vkd3d_test_name, line, vkd3d_test_state.context);
{
InterlockedIncrement(&vkd3d_test_state.bug_count);
printf("%s:%d%s: Driver bug: ", vkd3d_test_name, line, vkd3d_test_state.context);
}
vprintf(fmt, args);
fflush(stdout);
}
Expand Down Expand Up @@ -314,16 +320,20 @@ int main(int argc, char **argv)

vkd3d_test_main(argc, argv);

printf("%s: %lu tests executed (%lu failures, %lu successful todo, %lu skipped, %lu todo, %lu bugs).\n",
printf("%s: %lu tests executed (%lu failures, %lu successful todo, %lu skipped, %lu todo, %lu driver bugs, %lu fixed driver bugs).\n",
vkd3d_test_name,
(unsigned long)(vkd3d_test_state.success_count
+ vkd3d_test_state.failure_count + vkd3d_test_state.todo_count
+ vkd3d_test_state.todo_success_count),
+ vkd3d_test_state.failure_count
+ vkd3d_test_state.todo_count
+ vkd3d_test_state.todo_success_count
+ vkd3d_test_state.bug_count
+ vkd3d_test_state.bug_fixed_count),
(unsigned long)vkd3d_test_state.failure_count,
(unsigned long)vkd3d_test_state.todo_success_count,
(unsigned long)vkd3d_test_state.skip_count,
(unsigned long)vkd3d_test_state.todo_count,
(unsigned long)vkd3d_test_state.bug_count);
(unsigned long)vkd3d_test_state.bug_count,
(unsigned long)vkd3d_test_state.bug_fixed_count);

fflush(stdout);
return vkd3d_test_state.failure_count != 0;
Expand Down