[Piglit] [PATCH 13/15] fbo-colormask-formats: Report subtest results.

Eric Anholt eric at anholt.net
Mon Jan 14 10:55:40 PST 2013


---
 tests/fbo/fbo-colormask-formats.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/fbo/fbo-colormask-formats.c b/tests/fbo/fbo-colormask-formats.c
index 4bf3ece..eafd2ac 100644
--- a/tests/fbo/fbo-colormask-formats.c
+++ b/tests/fbo/fbo-colormask-formats.c
@@ -148,12 +148,12 @@ static enum piglit_result test_format(const struct format_desc *format)
 	assert(glGetError() == 0);
 
 	status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-	printf("Testing %s", format->name);
 	if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-		printf(" - fbo incomplete (status = 0x%04x)\n", status);
+		piglit_report_subtest_result(PIGLIT_SKIP,
+					     "%s (fbo incomplete)",
+					     format->name);
 		return PIGLIT_SKIP;
 	}
-	printf("\n");
 
 	glClearColor(0.0, 0.0, 0.0, 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -211,13 +211,11 @@ static enum piglit_result test_format(const struct format_desc *format)
 	glDeleteTextures(1, &tex);
 	glDeleteFramebuffersEXT(1, &fb);
 
-	if (!pass) {
-		piglit_present_results();
-		return PIGLIT_FAIL;
-	}
-
 	piglit_present_results();
 
+	piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL,
+				     format->name);
+
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
-- 
1.7.10.4



More information about the Piglit mailing list