diff options
author | Brian Paul <brianp@vmware.com> | 2013-09-27 10:45:30 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2013-10-08 09:28:42 -0600 |
commit | 064d588991073f0fbd72aa204e8ed621dc055c55 (patch) | |
tree | 12535a0724ec9b311c7ca734fc2184bf0e9f012f /tests/fbo | |
parent | c634685dcdcf090b1cd8315d7116a39d5ae15ede (diff) |
piglit: silence piglit_report_subtest_result() format warnings
silences a bunch of warnings such as:
"tests/fbo/fbo-alphatest-formats.c:184:3: warning: format not
a string literal and no format arguments [-Wformat-security]"
Diffstat (limited to 'tests/fbo')
-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 |
7 files changed, 13 insertions, 13 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); } } |