This prepares for using Piglit's subtest magic for non-GL tests. Signed-off-by: Chad Versace <chad.vers...@linux.intel.com> --- tests/util/piglit-framework-gl.c | 6 +++--- tests/util/piglit-framework-gl.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/util/piglit-framework-gl.c b/tests/util/piglit-framework-gl.c index cc21b16..76d751c 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 07a64aa..127f4be 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. -- 1.8.5.3 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit