shader_runner: don't abort on atomic counter subtest failure

Submitted by Marek Olšák on May 24, 2019, 1:38 a.m.

Details

Message ID 20190524013843.9184-1-maraeo@gmail.com
State New
Headers show
Series "shader_runner: don't abort on atomic counter subtest failure" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Marek Olšák May 24, 2019, 1:38 a.m.
From: Marek Olšák <marek.olsak@amd.com>

---
 tests/shaders/shader_runner.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 8404d548f..6729d82b7 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -3958,27 +3958,27 @@  piglit_display(void)
 		} else if (parse_str(line, "probe depth ", &rest)) {
 			parse_floats(rest, c, 3, NULL);
 			if (!piglit_probe_pixel_depth((int) c[0], (int) c[1],
 						      c[2])) {
 				result = PIGLIT_FAIL;
 			}
 		} else if (sscanf(line,
 				  "probe atomic counter buffer %u %u %s %u",
 				  &ux, &uy, s, &uz) == 4) {
 			if (!probe_atomic_counter(ux, uy, s, uz, true)) {
-				piglit_report_result(PIGLIT_FAIL);
+				result = PIGLIT_FAIL;
 			}
 		} else if (sscanf(line,
 				  "probe atomic counter %u %s %u",
 				  &ux, s, &uy) == 3) {
 			if (!probe_atomic_counter(0, ux, s, uy, false)) {
-				piglit_report_result(PIGLIT_FAIL);
+				result = PIGLIT_FAIL;
 			}
 		} else if (sscanf(line, "probe ssbo uint %d %d %s 0x%x",
 				  &x, &y, s, &z) == 4) {
 			if (!probe_ssbo_uint(x, y, s, z))
 				result = PIGLIT_FAIL;
 		} else if (sscanf(line, "probe ssbo uint %d %d %s %d",
 				  &x, &y, s, &z) == 4) {
 			if (!probe_ssbo_uint(x, y, s, z))
 				result = PIGLIT_FAIL;
 		} else if (sscanf(line,

Comments

Reviewed-by: Dave Airlie <airlied@redhat.com>

On Fri, 24 May 2019 at 11:38, Marek Olšák <maraeo@gmail.com> wrote:
>
> From: Marek Olšák <marek.olsak@amd.com>
>
> ---
>  tests/shaders/shader_runner.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
> index 8404d548f..6729d82b7 100644
> --- a/tests/shaders/shader_runner.c
> +++ b/tests/shaders/shader_runner.c
> @@ -3958,27 +3958,27 @@ piglit_display(void)
>                 } else if (parse_str(line, "probe depth ", &rest)) {
>                         parse_floats(rest, c, 3, NULL);
>                         if (!piglit_probe_pixel_depth((int) c[0], (int) c[1],
>                                                       c[2])) {
>                                 result = PIGLIT_FAIL;
>                         }
>                 } else if (sscanf(line,
>                                   "probe atomic counter buffer %u %u %s %u",
>                                   &ux, &uy, s, &uz) == 4) {
>                         if (!probe_atomic_counter(ux, uy, s, uz, true)) {
> -                               piglit_report_result(PIGLIT_FAIL);
> +                               result = PIGLIT_FAIL;
>                         }
>                 } else if (sscanf(line,
>                                   "probe atomic counter %u %s %u",
>                                   &ux, s, &uy) == 3) {
>                         if (!probe_atomic_counter(0, ux, s, uy, false)) {
> -                               piglit_report_result(PIGLIT_FAIL);
> +                               result = PIGLIT_FAIL;
>                         }
>                 } else if (sscanf(line, "probe ssbo uint %d %d %s 0x%x",
>                                   &x, &y, s, &z) == 4) {
>                         if (!probe_ssbo_uint(x, y, s, z))
>                                 result = PIGLIT_FAIL;
>                 } else if (sscanf(line, "probe ssbo uint %d %d %s %d",
>                                   &x, &y, s, &z) == 4) {
>                         if (!probe_ssbo_uint(x, y, s, z))
>                                 result = PIGLIT_FAIL;
>                 } else if (sscanf(line,
> --
> 2.17.1
>
> _______________________________________________
> Piglit mailing list
> Piglit@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit