[waffle] [PATCH 23/29] tests/gl_basic: enable wayland

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 tests/functional/gl_basic_test.c | 67 ++++------------------------------------
 1 file changed, 6 insertions(+), 61 deletions(-)

diff --git a/tests/functional/gl_basic_test.c b/tests/functional/gl_basic_test.c
index 283489c..c4faa11 100644
--- a/tests/functional/gl_basic_test.c
+++ b/tests/functional/gl_basic_test.c
@@ -702,69 +702,15 @@ CREATE_TESTSUITE(WAFFLE_PLATFORM_GLX, glx)
 
 #endif // WAFFLE_HAS_GLX
 
-#if 0
 #ifdef WAFFLE_HAS_WAYLAND
-TEST(gl_basic, wayland_init)
-{
-    gl_basic_init(WAFFLE_PLATFORM_WAYLAND);
-}
-
-static void
-testsuite_wayland(void)
-{
-    TEST_RUN(gl_basic, wayland_init);
-
-    TEST_RUN(gl_basic, gl_rgb);
-    TEST_RUN(gl_basic, gl_rgba);
-    TEST_RUN(gl_basic, gl_fwdcompat);
-    TEST_RUN(gl_basic, gl_debug);
-
-    TEST_RUN(gl_basic, gl10);
-    TEST_RUN(gl_basic, gl11);
-    TEST_RUN(gl_basic, gl12);
-    TEST_RUN(gl_basic, gl13);
-    TEST_RUN(gl_basic, gl14);
-    TEST_RUN(gl_basic, gl15);
-    TEST_RUN(gl_basic, gl20);
-    TEST_RUN(gl_basic, gl21);
-    TEST_RUN(gl_basic, gl21_fwdcompat);
 
-    TEST_RUN(gl_basic, gl30);
-    TEST_RUN(gl_basic, gl30_fwdcompat);
-    TEST_RUN(gl_basic, gl31);
-    TEST_RUN(gl_basic, gl31_fwdcompat);
-
-    TEST_RUN(gl_basic, gl32_core);
-    TEST_RUN(gl_basic, gl32_core_fwdcompat);
-    TEST_RUN(gl_basic, gl33_core);
-    TEST_RUN(gl_basic, gl40_core);
-    TEST_RUN(gl_basic, gl41_core);
-    TEST_RUN(gl_basic, gl42_core);
-    TEST_RUN(gl_basic, gl43_core);
+#define unit_test_make(name)                                            \
+    cmocka_unit_test_setup_teardown(name, setup_wayland, gl_basic_fini)
 
-    TEST_RUN(gl_basic, gl32_compat);
-    TEST_RUN(gl_basic, gl33_compat);
-    TEST_RUN(gl_basic, gl40_compat);
-    TEST_RUN(gl_basic, gl41_compat);
-    TEST_RUN(gl_basic, gl42_compat);
-    TEST_RUN(gl_basic, gl43_compat);
+CREATE_TESTSUITE(WAFFLE_PLATFORM_WAYLAND, wayland)
 
-    TEST_RUN(gl_basic, gles1_rgb);
-    TEST_RUN(gl_basic, gles1_rgba);
-    TEST_RUN(gl_basic, gles1_fwdcompat);
-    TEST_RUN(gl_basic, gles10);
-    TEST_RUN(gl_basic, gles11);
-
-    TEST_RUN(gl_basic, gles2_rgb);
-    TEST_RUN(gl_basic, gles2_rgba);
-    TEST_RUN(gl_basic, gles2_fwdcompat);
-    TEST_RUN(gl_basic, gles20);
+#undef unit_test_make
 
-    TEST_RUN(gl_basic, gles3_rgb);
-    TEST_RUN(gl_basic, gles3_rgba);
-    TEST_RUN(gl_basic, gles3_fwdcompat);
-    TEST_RUN(gl_basic, gles30);
-}
 #endif // WAFFLE_HAS_WAYLAND
 
 #ifdef WAFFLE_HAS_X11_EGL
@@ -1081,12 +1027,11 @@ main(int argc, char *argv[])
     case WAFFLE_PLATFORM_GLX:
         return testsuite_glx();
 #endif
-#if 0
 #ifdef WAFFLE_HAS_WAYLAND
     case WAFFLE_PLATFORM_WAYLAND:
-        run_testsuite(testsuite_wayland);
-        break;
+        return testsuite_wayland();
 #endif
+#if 0
 #ifdef WAFFLE_HAS_WGL
     case WAFFLE_PLATFORM_WGL:
         run_testsuite(testsuite_wgl);
-- 
2.6.2