[Piglit] [PATCH 1/2] arb_shader_image_size/builtin: don't report subtests that are never run

Marek Olšák maraeo at gmail.com
Fri Apr 8 08:56:52 UTC 2016


From: Marek Olšák <marek.olsak at amd.com>

this removes a lot of skipped subtests from results
---
 tests/spec/arb_shader_image_size/builtin.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/spec/arb_shader_image_size/builtin.c b/tests/spec/arb_shader_image_size/builtin.c
index 434af70..c8a7724 100755
--- a/tests/spec/arb_shader_image_size/builtin.c
+++ b/tests/spec/arb_shader_image_size/builtin.c
@@ -254,11 +254,13 @@ test_max_dimensions(const struct image_format_info *format,
 			const struct image_extent size =
 					get_test_extent(target, d);
 
-			subtest(status,
-				!quick &&
-				is_test_reasonable(!slow, size) &&
-				is_format_interesting(format, slow) &&
-				is_stage_interesting(stage, slow),
+			if (quick ||
+			    !is_test_reasonable(!slow, size) ||
+			    !is_format_interesting(format, slow) ||
+			    !is_stage_interesting(stage, slow))
+				continue;
+
+			subtest(status, true,
 				run_test(format, target, size),
 				"%s/%s/image%s max size test/%dx%dx%dx%d",
 				format->name, stage->name, target->name,
@@ -278,9 +280,11 @@ test_small_dimensions(const struct image_format_info *format,
 			image_extent_for_target(target,
 						16, 96);
 
-	subtest(status,
-		is_format_interesting(format, slow) &&
-		is_stage_interesting(stage, slow),
+	if (!is_format_interesting(format, slow) ||
+	    !is_stage_interesting(stage, slow))
+		return;
+
+	subtest(status, true,
 		run_test(format, target, size),
 		"%s/%s/image%s size test/%dx%dx%dx%d",
 		format->name, stage->name, target->name,
-- 
2.5.0



More information about the Piglit mailing list