Re: [PATCH v4 0/1] MR499: tests: Print the line number of the probe when a test fails.

[Petrichor Park (＠petrathekat)]

On Tue Dec  5 12:27:26 2023 +0000, Henri Verbeet wrote:
> > Maybe? It would require a whole lot of rewriting of that function, and
>
> it's so messy I think it's probably easier to just monkey-patch it like this.
> I may be overlooking the obvious, but it doesn't seem that complicated.
> E.g., something like the following seems to work for me at first sight:
> diff --git a/tests/shader_runner.c b/tests/shader_runner.c
> index 0e6104ce..f94e3309 100644
> --- a/tests/shader_runner.c
> +++ b/tests/shader_runner.c
> @@ -1121,6 +1121,7 @@ void run_shader_tests(struct shader_runner
> *runner, const struct shader_runner_o
>      HRESULT expect_hr = S_OK;
>      bool skip_tests = false;
>      char line_buffer[256];
> +    const char *testname;
>      FILE *f;
>
>      if (!test_options.filename)
> @@ -1134,12 +1135,19 @@ void run_shader_tests(struct shader_runner
> *runner, const struct shader_runner_o
>      runner->minimum_shader_model = minimum_shader_model;
>      runner->maximum_shader_model = maximum_shader_model;
>
> +    if ((testname = strrchr(test_options.filename, '/')))
> +        ++testname;
> +    else
> +        testname = test_options.filename;
> +
>      for (;;)
>      {
>          char *ret = fgets(line_buffer, sizeof(line_buffer), f);
>          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] == '[')
>          {
> @@ -1289,9 +1297,6 @@ void run_shader_tests(struct shader_runner
> *runner, const struct shader_runner_o
>                  }
>              }
>
> -            if (state != STATE_NONE)
> -                vkd3d_test_pop_context();
> -
>              if (!ret)
>                  break;
>          }
> @@ -1432,8 +1437,6 @@ void run_shader_tests(struct shader_runner
> *runner, const struct shader_runner_o
>                      free(runner->input_elements[i].name);
>                  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')
>          {
> @@ -1488,6 +1491,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)
>          free(runner->input_elements[i].name);
>      free(runner->input_elements);

Thanks! (This is my first time looking at the test harness code so I'm not super sure how it works.)