wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Introduce vkd3d_test_set_context().

Browse Source 
Useful for table-based tests.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-12-11 15:47:57 +01:00 committed by Alexandre Julliard
parent b868b5a258
commit d0f6d8131a
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/private/vkd3d_test.h
View File

@ -93,6 +93,8 @@ static struct
unsigned int todo_level;
bool todo_do_loop;
char context[1024];
} vkd3d_test_state;
static bool
@ -116,13 +118,13 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg
{
if (result)
{
printf("%s:%d Todo succeeded: ", vkd3d_test_name, line);
printf("%s:%d%s: Todo succeeded: ", vkd3d_test_name, line, vkd3d_test_state.context);
vprintf(fmt, args);
InterlockedIncrement(&vkd3d_test_state.todo_success_count);
}
else
{
printf("%s:%d: Todo: ", vkd3d_test_name, line);
printf("%s:%d%s: Todo: ", vkd3d_test_name, line, vkd3d_test_state.context);
vprintf(fmt, args);
InterlockedIncrement(&vkd3d_test_state.todo_count);
}
@ -130,12 +132,12 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg
else if (result)
{
if (vkd3d_test_state.debug_level > 1)
printf("%s:%d: Test succeeded.\n", vkd3d_test_name, line);
printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context);
InterlockedIncrement(&vkd3d_test_state.success_count);
}
else
{
printf("%s:%d: Test failed: ", vkd3d_test_name, line);
printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context);
vprintf(fmt, args);
InterlockedIncrement(&vkd3d_test_state.failure_count);
}
@ -156,7 +158,7 @@ vkd3d_test_skip(unsigned int line, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
printf("%s:%d: Test skipped: ", vkd3d_test_name, line);
printf("%s:%d%s: Test skipped: ", vkd3d_test_name, line, vkd3d_test_state.context);
vprintf(fmt, args);
va_end(args);
InterlockedIncrement(&vkd3d_test_state.skip_count);
@ -167,7 +169,7 @@ vkd3d_test_trace(unsigned int line, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
printf("%s:%d: ", vkd3d_test_name, line);
printf("%s:%d%s: ", vkd3d_test_name, line, vkd3d_test_state.context);
vprintf(fmt, args);
va_end(args);
}
@ -304,6 +306,23 @@ static inline void vkd3d_test_end_todo(void)
vkd3d_test_state.todo_level >>= 1;
}
static inline void vkd3d_test_set_context(const char *fmt, ...)
{
va_list args;
if (!fmt)
{
vkd3d_test_state.context[0] = '\0';
return;
}
vkd3d_test_state.context[0] = ':';
va_start(args, fmt);
vsnprintf(&vkd3d_test_state.context[1], sizeof(vkd3d_test_state.context) - 1, fmt, args);
va_end(args);
vkd3d_test_state.context[sizeof(vkd3d_test_state.context) - 1] = '\0';
}
#define run_test(test_pfn) \
vkd3d_run_test(#test_pfn, test_pfn)

3
tests/d3d12.c
View File

@ -18734,6 +18734,8 @@ static void test_instance_id(void)
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
vkd3d_test_set_context("Test %u", i);
layout_desc[1].InstanceDataStepRate = tests[i].color_step_rate;
input_layout.pInputElementDescs = layout_desc;
input_layout.NumElements = ARRAY_SIZE(layout_desc);
@ -18784,6 +18786,7 @@ static void test_instance_id(void)
ID3D12PipelineState_Release(context.pipeline_state);
context.pipeline_state = NULL;
}
vkd3d_test_set_context(NULL);
ID3D12CommandSignature_Release(command_signature);
ID3D12Resource_Release(argument_buffer);