summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2014-02-10 13:22:35 -0800
committerChad Versace <chad.versace@linux.intel.com>2014-04-17 13:12:39 -0700
commitc8b9727cdd7cd15b7d22b7f9c8121cefe12c393c (patch)
tree1e4dc72c831c65759046026eb23901eadb187ef8
parent3d21929cc4265cc2d3ecd15b3c2d192e52cfa1d5 (diff)
util/gl: Rename PIGLIT_GL_SUBTEST_END -> PIGLIT_SUBTEST_END
This prepares for using Piglit's subtest magic for non-GL tests. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
-rw-r--r--tests/util/piglit-framework-gl.c6
-rw-r--r--tests/util/piglit-framework-gl.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/util/piglit-framework-gl.c b/tests/util/piglit-framework-gl.c
index cc21b16cb..76d751c1f 100644
--- a/tests/util/piglit-framework-gl.c
+++ b/tests/util/piglit-framework-gl.c
@@ -107,7 +107,7 @@ piglit_parse_subtest_args(int *argc, char *argv[],
exit(EXIT_FAILURE);
}
- for (i = 0; !PIGLIT_GL_SUBTEST_END(&subtests[i]); ++i) {
+ for (i = 0; !PIGLIT_SUBTEST_END(&subtests[i]); ++i) {
printf("%s: %s\n",
subtests[i].option,
subtests[i].name);
@@ -279,7 +279,7 @@ piglit_find_subtest(const struct piglit_subtest *subtests, const char *name)
{
unsigned i;
- for (i = 0; !PIGLIT_GL_SUBTEST_END(&subtests[i]); i++) {
+ for (i = 0; !PIGLIT_SUBTEST_END(&subtests[i]); i++) {
if (strcmp(subtests[i].option, name) == 0)
return &subtests[i];
}
@@ -320,7 +320,7 @@ piglit_run_selected_subtests(const struct piglit_subtest *all_subtests,
} else {
unsigned i;
- for (i = 0; !PIGLIT_GL_SUBTEST_END(&all_subtests[i]); i++) {
+ for (i = 0; !PIGLIT_SUBTEST_END(&all_subtests[i]); i++) {
const enum piglit_result subtest_result =
all_subtests[i].subtest_func(all_subtests[i].data);
piglit_report_subtest_result(subtest_result, "%s",
diff --git a/tests/util/piglit-framework-gl.h b/tests/util/piglit-framework-gl.h
index 07a64aac3..127f4be5a 100644
--- a/tests/util/piglit-framework-gl.h
+++ b/tests/util/piglit-framework-gl.h
@@ -65,7 +65,7 @@ struct piglit_subtest {
* The array of subtests is terminated by structure with a \c NULL \c
* name pointer.
*/
-#define PIGLIT_GL_SUBTEST_END(s) ((s)->name == NULL)
+#define PIGLIT_SUBTEST_END(s) ((s)->name == NULL)
/**
* @brief Configuration for running an OpenGL test.