aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-01-14 09:51:44 -0800
committerEric Anholt <eric@anholt.net>2013-01-21 12:47:29 -0800
commit67cb4cb61654451f8e8d7615d157a9114eb0bc33 (patch)
tree3ec538732adaec2f60039c33c40a571bbbb9d6b8
parent9e2c194a32c8569b157d4455e98e66b270f7a89a (diff)
downloadpiglit-67cb4cb61654451f8e8d7615d157a9114eb0bc33.tar.gz
fbo-colormask-formats: Report subtest results.
v2: Leave printfs in place, get the name for the enum. Reviewed-by: Carl Worth <cworth@cworth.org> Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--tests/fbo/fbo-colormask-formats.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/fbo/fbo-colormask-formats.c b/tests/fbo/fbo-colormask-formats.c
index 4bf3ece6..e56fb31b 100644
--- a/tests/fbo/fbo-colormask-formats.c
+++ b/tests/fbo/fbo-colormask-formats.c
@@ -150,7 +150,11 @@ static enum piglit_result test_format(const struct format_desc *format)
status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
printf("Testing %s", format->name);
if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
- printf(" - fbo incomplete (status = 0x%04x)\n", status);
+ printf(" - fbo incomplete (status = %s)\n",
+ piglit_get_gl_enum_name(status));
+ piglit_report_subtest_result(PIGLIT_SKIP,
+ "%s (fbo incomplete)",
+ format->name);
return PIGLIT_SKIP;
}
printf("\n");
@@ -211,13 +215,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;
}