diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fbo/fbo-alphatest-formats.c | 6 | ||||
-rw-r--r-- | tests/fbo/fbo-blending-formats.c | 6 | ||||
-rw-r--r-- | tests/fbo/fbo-clear-formats.c | 2 | ||||
-rw-r--r-- | tests/fbo/fbo-colormask-formats.c | 2 | ||||
-rw-r--r-- | tests/fbo/fbo-incomplete.cpp | 2 | ||||
-rw-r--r-- | tests/fbo/fbo-readpixels-depth-formats.c | 2 | ||||
-rw-r--r-- | tests/fbo/fbo-storage-formats.c | 6 | ||||
-rw-r--r-- | tests/general/linestipple.c | 4 | ||||
-rw-r--r-- | tests/spec/arb_texture_buffer_object/formats.c | 2 | ||||
-rw-r--r-- | tests/spec/arb_texture_multisample/fb-completeness.c | 2 | ||||
-rw-r--r-- | tests/spec/arb_texture_multisample/negative-max-samples.c | 2 | ||||
-rw-r--r-- | tests/spec/arb_texture_storage_multisample/tex-param.c | 10 | ||||
-rw-r--r-- | tests/spec/gl-1.0/beginend-coverage.c | 2 | ||||
-rw-r--r-- | tests/spec/gl-1.0/rendermode-feedback.c | 4 |
14 files changed, 26 insertions, 26 deletions
diff --git a/tests/fbo/fbo-alphatest-formats.c b/tests/fbo/fbo-alphatest-formats.c index e3c3827a8..59881c2a1 100644 --- a/tests/fbo/fbo-alphatest-formats.c +++ b/tests/fbo/fbo-alphatest-formats.c @@ -181,7 +181,7 @@ static enum piglit_result test_format(const struct format_desc *format) if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { printf("- fbo incomplete (status = %s)\n", piglit_get_gl_enum_name(status)); - piglit_report_subtest_result(PIGLIT_SKIP, format->name); + piglit_report_subtest_result(PIGLIT_SKIP, "%s", format->name); return PIGLIT_SKIP; } printf("\n"); @@ -254,7 +254,7 @@ static enum piglit_result test_format(const struct format_desc *format) if (!pass) { piglit_present_results(); - piglit_report_subtest_result(PIGLIT_FAIL, format->name); + piglit_report_subtest_result(PIGLIT_FAIL, "%s", format->name); return PIGLIT_FAIL; } @@ -316,7 +316,7 @@ static enum piglit_result test_format(const struct format_desc *format) piglit_present_results(); piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL, - format->name); + "%s", format->name); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-blending-formats.c b/tests/fbo/fbo-blending-formats.c index 37c32ef2a..50b2d0a19 100644 --- a/tests/fbo/fbo-blending-formats.c +++ b/tests/fbo/fbo-blending-formats.c @@ -289,7 +289,7 @@ static enum piglit_result test_format(const struct format_desc *format) if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { printf(" - fbo incomplete (status = %s)\n", piglit_get_gl_enum_name(status)); - piglit_report_subtest_result(PIGLIT_SKIP, format->name); + piglit_report_subtest_result(PIGLIT_SKIP, "%s", format->name); return PIGLIT_SKIP; } printf("\n"); @@ -350,7 +350,7 @@ static enum piglit_result test_format(const struct format_desc *format) if (!pass) { piglit_present_results(); - piglit_report_subtest_result(PIGLIT_FAIL, format->name); + piglit_report_subtest_result(PIGLIT_FAIL, "%s", format->name); return PIGLIT_FAIL; } @@ -403,7 +403,7 @@ static enum piglit_result test_format(const struct format_desc *format) piglit_present_results(); piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL, - format->name); + "%s", format->name); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-clear-formats.c b/tests/fbo/fbo-clear-formats.c index 8ee8e977a..7a68f2348 100644 --- a/tests/fbo/fbo-clear-formats.c +++ b/tests/fbo/fbo-clear-formats.c @@ -565,7 +565,7 @@ test_format(const struct format_desc *format) glDeleteTextures(1, &tex); piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL, - format->name); + "%s", format->name); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-colormask-formats.c b/tests/fbo/fbo-colormask-formats.c index d842e4fe0..f6a951d47 100644 --- a/tests/fbo/fbo-colormask-formats.c +++ b/tests/fbo/fbo-colormask-formats.c @@ -218,7 +218,7 @@ static enum piglit_result test_format(const struct format_desc *format) piglit_present_results(); piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL, - format->name); + "%s", format->name); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-incomplete.cpp b/tests/fbo/fbo-incomplete.cpp index 576b45da8..d4f4f9d5d 100644 --- a/tests/fbo/fbo-incomplete.cpp +++ b/tests/fbo/fbo-incomplete.cpp @@ -75,7 +75,7 @@ public: glDeleteFramebuffers(1, &fbo); piglit_report_subtest_result(_pass ? PIGLIT_PASS : PIGLIT_FAIL, - name); + "%s", name); } bool check_fbo_status(GLenum expect) diff --git a/tests/fbo/fbo-readpixels-depth-formats.c b/tests/fbo/fbo-readpixels-depth-formats.c index b627878f7..f43b1d464 100644 --- a/tests/fbo/fbo-readpixels-depth-formats.c +++ b/tests/fbo/fbo-readpixels-depth-formats.c @@ -202,7 +202,7 @@ test_with_format(GLenum internal_format, const char *name) status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT); if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { fprintf(stderr, "framebuffer incomplete\n"); - piglit_report_subtest_result(PIGLIT_SKIP, name); + piglit_report_subtest_result(PIGLIT_SKIP, "%s", name); goto done; } diff --git a/tests/fbo/fbo-storage-formats.c b/tests/fbo/fbo-storage-formats.c index bbe286c9f..3b6b70922 100644 --- a/tests/fbo/fbo-storage-formats.c +++ b/tests/fbo/fbo-storage-formats.c @@ -195,7 +195,7 @@ test(void) glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, formats[i].format, piglit_width, piglit_height); if (!piglit_check_gl_error(GL_NO_ERROR)) { - piglit_report_subtest_result(PIGLIT_FAIL, name); + piglit_report_subtest_result(PIGLIT_FAIL, "%s", name); pass = GL_FALSE; } else { GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); @@ -215,10 +215,10 @@ test(void) invalid_formats[i], piglit_width, piglit_height); if (!piglit_check_gl_error(GL_INVALID_ENUM)) { - piglit_report_subtest_result(PIGLIT_FAIL, name); + piglit_report_subtest_result(PIGLIT_FAIL, "%s", name); pass = GL_FALSE; } else { - piglit_report_subtest_result(PIGLIT_PASS, name); + piglit_report_subtest_result(PIGLIT_PASS, "%s", name); } } diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c index 21d689c25..98ecf5825 100644 --- a/tests/general/linestipple.c +++ b/tests/general/linestipple.c @@ -219,9 +219,9 @@ piglit_display(void) for (i = 0; i < ARRAY_SIZE(Lines); ++i) { printf("Testing %s:\n", Lines[i].name); if (test_line(&Lines[i])) { - piglit_report_subtest_result(PIGLIT_PASS, Lines[i].name); + piglit_report_subtest_result(PIGLIT_PASS, "%s", Lines[i].name); } else { - piglit_report_subtest_result(PIGLIT_FAIL, Lines[i].name); + piglit_report_subtest_result(PIGLIT_FAIL, "%s", Lines[i].name); pass = false; } } diff --git a/tests/spec/arb_texture_buffer_object/formats.c b/tests/spec/arb_texture_buffer_object/formats.c index 6e54b4e47..ed73cc13b 100644 --- a/tests/spec/arb_texture_buffer_object/formats.c +++ b/tests/spec/arb_texture_buffer_object/formats.c @@ -536,7 +536,7 @@ test_format(int format_index) y_index++; piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL, - piglit_get_gl_enum_name(format->format)); + "%s", piglit_get_gl_enum_name(format->format)); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/spec/arb_texture_multisample/fb-completeness.c b/tests/spec/arb_texture_multisample/fb-completeness.c index 55c621bce..676ac6174 100644 --- a/tests/spec/arb_texture_multisample/fb-completeness.c +++ b/tests/spec/arb_texture_multisample/fb-completeness.c @@ -320,7 +320,7 @@ piglit_init(int argc, char **argv) } for (info = tests; info->name; info++) - piglit_report_subtest_result(exec_test(info, sample_count), info->name); + piglit_report_subtest_result(exec_test(info, sample_count), "%s", info->name); piglit_report_result(result); } diff --git a/tests/spec/arb_texture_multisample/negative-max-samples.c b/tests/spec/arb_texture_multisample/negative-max-samples.c index 2deb9c9c7..38a30eb8e 100644 --- a/tests/spec/arb_texture_multisample/negative-max-samples.c +++ b/tests/spec/arb_texture_multisample/negative-max-samples.c @@ -106,7 +106,7 @@ check_subtest(struct subtest *t) piglit_report_subtest_result( piglit_check_gl_error(t->error) ? PIGLIT_PASS : PIGLIT_FAIL, - t->name); + "%s", t->name); } void diff --git a/tests/spec/arb_texture_storage_multisample/tex-param.c b/tests/spec/arb_texture_storage_multisample/tex-param.c index 11e7d7815..55864f5d3 100644 --- a/tests/spec/arb_texture_storage_multisample/tex-param.c +++ b/tests/spec/arb_texture_storage_multisample/tex-param.c @@ -83,7 +83,7 @@ check_subtest(struct subtest *t) if (!piglit_check_gl_error(GL_NO_ERROR)) { printf("GetTexParameteriv failed\n"); - piglit_report_subtest_result(PIGLIT_FAIL, test_name); + piglit_report_subtest_result(PIGLIT_FAIL, "%s", test_name); return; } @@ -92,7 +92,7 @@ check_subtest(struct subtest *t) piglit_get_gl_enum_name(t->param), t->initial_value, val); - piglit_report_subtest_result(PIGLIT_FAIL, test_name); + piglit_report_subtest_result(PIGLIT_FAIL, "%s", test_name); return; } @@ -101,7 +101,7 @@ check_subtest(struct subtest *t) if (!piglit_check_gl_error(t->expected_error)) { printf("error setting parameter %s\n", piglit_get_gl_enum_name(t->param)); - piglit_report_subtest_result(PIGLIT_FAIL, test_name); + piglit_report_subtest_result(PIGLIT_FAIL, "%s", test_name); return; } @@ -114,10 +114,10 @@ check_subtest(struct subtest *t) piglit_get_gl_enum_name(t->param), expected_val, val); - piglit_report_subtest_result(PIGLIT_FAIL, test_name); + piglit_report_subtest_result(PIGLIT_FAIL, "%s", test_name); } - piglit_report_subtest_result(PIGLIT_PASS, test_name); + piglit_report_subtest_result(PIGLIT_PASS, "%s", test_name); } void diff --git a/tests/spec/gl-1.0/beginend-coverage.c b/tests/spec/gl-1.0/beginend-coverage.c index 29044ef0e..8befd304b 100644 --- a/tests/spec/gl-1.0/beginend-coverage.c +++ b/tests/spec/gl-1.0/beginend-coverage.c @@ -845,7 +845,7 @@ run_tests(struct test *tests, int num_tests, GLenum expected_error) piglit_report_subtest_result(test_pass ? PIGLIT_PASS : PIGLIT_FAIL, - tests[i].name); + "%s", tests[i].name); pass = test_pass && pass; } diff --git a/tests/spec/gl-1.0/rendermode-feedback.c b/tests/spec/gl-1.0/rendermode-feedback.c index 5eb83622e..8691c965d 100644 --- a/tests/spec/gl-1.0/rendermode-feedback.c +++ b/tests/spec/gl-1.0/rendermode-feedback.c @@ -171,10 +171,10 @@ piglit_display(void) pass = false; report_failure(&types[i], buffer, returned_count); piglit_report_subtest_result(PIGLIT_FAIL, - types[i].name); + "%s", types[i].name); } else { piglit_report_subtest_result(PIGLIT_PASS, - types[i].name); + "%s", types[i].name); } } |