wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Print the failing line numbers when a test fails.

Browse Source 
Currently, if a probe fails, it will print the line number of the [test]
block the probe is in, not the line number of the probe itself. This
makes it somewhat difficult to debug.

This commit makes it print the line number that a test fails at.
This commit is contained in:
Henri Verbeet 2023-12-07 10:26:34 -06:00 committed by Alexandre Julliard
parent 812f01c2e2
commit 62f18f749b
Notes: Alexandre Julliard 2024-01-02 23:09:17 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/516
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/shader_runner.c
View File

@ -1130,6 +1130,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o
HRESULT expect_hr = S_OK; HRESULT expect_hr = S_OK;
bool skip_tests = false; bool skip_tests = false;
char line_buffer[256]; char line_buffer[256];
const char *testname;
FILE *f; FILE *f;
if (!test_options.filename) if (!test_options.filename)
@ -1143,12 +1144,19 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o
runner->minimum_shader_model = minimum_shader_model; runner->minimum_shader_model = minimum_shader_model;
runner->maximum_shader_model = maximum_shader_model; runner->maximum_shader_model = maximum_shader_model;
if ((testname = strrchr(test_options.filename, '/')))
++testname;
else
testname = test_options.filename;
for (;;) for (;;)
{ {
char *ret = fgets(line_buffer, sizeof(line_buffer), f); char *ret = fgets(line_buffer, sizeof(line_buffer), f);
const char *line = line_buffer; const char *line = line_buffer;
++line_number; if (line_number++)
vkd3d_test_pop_context();
vkd3d_test_push_context("%s:%u", testname, line_number);
if (!ret || line[0] == '[') if (!ret || line[0] == '[')
{ {
@ -1298,9 +1306,6 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o
} }
} }
if (state != STATE_NONE)
vkd3d_test_pop_context();
if (!ret) if (!ret)
break; break;
} }
@ -1443,8 +1448,6 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o
free(runner->input_elements[i].name); free(runner->input_elements[i].name);
runner->input_element_count = 0; runner->input_element_count = 0;
} }
vkd3d_test_push_context("Section %.*s, line %u", strlen(line_buffer) - 1, line_buffer, line_number);
} }
else if (line[0] != '%' && line[0] != '\n') else if (line[0] != '%' && line[0] != '\n')
{ {
@ -1499,6 +1502,9 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o
} }
} }
if (line_number)
vkd3d_test_pop_context();
for (i = 0; i < runner->input_element_count; ++i) for (i = 0; i < runner->input_element_count; ++i)
free(runner->input_elements[i].name); free(runner->input_elements[i].name);
free(runner->input_elements); free(runner->input_elements);