If we pass -samples=X to a piglit test and the driver does not support MSAA, we get different test results depending on whether or not we set the -fbo flag.
For example: $ bin/draw-pixels -auto -samples=4 piglit: error: waffle_config_choose failed due to WAFFLE_ERROR_UNKNOWN: glXChooseFBConfig returned no matching configs piglit: error: Failed to create waffle_config for OpenGL 1.0 Compatibility Context piglit: info: Failed to create any GL context PIGLIT: {"result": "skip" } vs. $ bin/draw-pixels -auto -samples=4 -fbo The FBO mode doesn't support multisampling PIGLIT: {"result": "fail" } This patch changes the later case to report PIGLIT_SKIP instead of FAIL to be consistent. Also, remove \n from puts() calls since puts() appends \n for us. --- tests/util/piglit-framework-gl/piglit_fbo_framework.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/util/piglit-framework-gl/piglit_fbo_framework.c b/tests/util/piglit-framework-gl/piglit_fbo_framework.c index 456cf7e..77e717b 100644 --- a/tests/util/piglit-framework-gl/piglit_fbo_framework.c +++ b/tests/util/piglit-framework-gl/piglit_fbo_framework.c @@ -141,8 +141,8 @@ piglit_fbo_framework_create(const struct piglit_gl_test_config *test_config) platform = piglit_wfl_framework_choose_platform(test_config); if (test_config->window_samples > 1) { - puts("The FBO mode doesn't support multisampling\n"); - piglit_report_result(PIGLIT_FAIL); + puts("The FBO mode doesn't support multisampling"); + piglit_report_result(PIGLIT_SKIP); } wfl_fw = calloc(1, sizeof(*wfl_fw)); -- 1.9.1 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit