wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests: Factor out vkd3d_test_printf().

Browse Source
This commit is contained in:
Zebediah Figura
2023-02-23 15:42:18 -06:00
committed by Alexandre Julliard
parent f3e81327dc
commit 1bf5050d3d
Notes: Alexandre Julliard 2023-04-04 22:35:39 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/133
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/private/vkd3d_test.h
View File

@ -134,6 +134,11 @@ broken(bool condition)
return condition && vkd3d_test_platform_is_windows(); return condition && vkd3d_test_platform_is_windows();
} }
static void vkd3d_test_printf(unsigned int line, const char *msg)
{
printf("%s:%u%s: %s", vkd3d_test_name, line, vkd3d_test_state.context, msg);
}
static void static void
vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va_list args) vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va_list args)
{ {
@ -141,12 +146,12 @@ vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va
{ {
InterlockedIncrement(&vkd3d_test_state.success_count); InterlockedIncrement(&vkd3d_test_state.success_count);
if (vkd3d_test_state.debug_level > 1) if (vkd3d_test_state.debug_level > 1)
printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); vkd3d_test_printf(line, "Test succeeded.\n");
} }
else else
{ {
InterlockedIncrement(&vkd3d_test_state.failure_count); InterlockedIncrement(&vkd3d_test_state.failure_count);
printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); vkd3d_test_printf(line, "Test failed: ");
vprintf(fmt, args); vprintf(fmt, args);
} }
} }
@ -173,9 +178,9 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg
if (is_todo) if (is_todo)
result = !result; result = !result;
if (result) if (result)
printf("%s:%d%s: Fixed bug: ", vkd3d_test_name, line, vkd3d_test_state.context); vkd3d_test_printf(line, "Fixed bug: ");
else else
printf("%s:%d%s: Bug: ", vkd3d_test_name, line, vkd3d_test_state.context); vkd3d_test_printf(line, "Bug: ");
vprintf(fmt, args); vprintf(fmt, args);
} }
else if (is_todo) else if (is_todo)
@ -183,12 +188,12 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg
if (result) if (result)
{ {
InterlockedIncrement(&vkd3d_test_state.todo_success_count); InterlockedIncrement(&vkd3d_test_state.todo_success_count);
printf("%s:%d%s: Todo succeeded: ", vkd3d_test_name, line, vkd3d_test_state.context); vkd3d_test_printf(line, "Todo succeeded: ");
} }
else else
{ {
InterlockedIncrement(&vkd3d_test_state.todo_count); InterlockedIncrement(&vkd3d_test_state.todo_count);
printf("%s:%d%s: Todo: ", vkd3d_test_name, line, vkd3d_test_state.context); vkd3d_test_printf(line, "Todo: ");
} }
vprintf(fmt, args); vprintf(fmt, args);
} }
@ -213,7 +218,7 @@ vkd3d_test_skip(unsigned int line, const char *fmt, ...)
{ {
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
printf("%s:%d%s: Test skipped: ", vkd3d_test_name, line, vkd3d_test_state.context); vkd3d_test_printf(line, "Test skipped: ");
vprintf(fmt, args); vprintf(fmt, args);
va_end(args); va_end(args);
InterlockedIncrement(&vkd3d_test_state.skip_count); InterlockedIncrement(&vkd3d_test_state.skip_count);
@ -224,7 +229,7 @@ vkd3d_test_trace(unsigned int line, const char *fmt, ...)
{ {
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
printf("%s:%d%s: ", vkd3d_test_name, line, vkd3d_test_state.context); vkd3d_test_printf(line, "");
vprintf(fmt, args); vprintf(fmt, args);
va_end(args); va_end(args);
} }