[waffle] [PATCH 24/29] tests/gl_basic: enable x11_egl

[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 | 66 ++++------------------------------------
 1 file changed, 6 insertions(+), 60 deletions(-)

diff --git a/tests/functional/gl_basic_test.c b/tests/functional/gl_basic_test.c
index c4faa11..9a2bfff 100644
--- a/tests/functional/gl_basic_test.c
+++ b/tests/functional/gl_basic_test.c
@@ -714,67 +714,14 @@ CREATE_TESTSUITE(WAFFLE_PLATFORM_WAYLAND, wayland)
 #endif // WAFFLE_HAS_WAYLAND
 
 #ifdef WAFFLE_HAS_X11_EGL
-TEST(gl_basic, x11_egl_init)
-{
-    gl_basic_init(WAFFLE_PLATFORM_X11_EGL);
-}
-
-static void
-testsuite_x11_egl(void)
-{
-    TEST_RUN(gl_basic, x11_egl_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);
 
-    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);
+#define unit_test_make(name)                                            \
+    cmocka_unit_test_setup_teardown(name, setup_x11_egl, gl_basic_fini)
 
-    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);
+CREATE_TESTSUITE(WAFFLE_PLATFORM_X11_EGL, x11_egl)
 
-    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_X11_EGL
 
 #ifdef WAFFLE_HAS_WGL
@@ -1037,12 +984,11 @@ main(int argc, char *argv[])
         run_testsuite(testsuite_wgl);
         break;
 #endif
+#endif // 0
 #ifdef WAFFLE_HAS_X11_EGL
     case WAFFLE_PLATFORM_X11_EGL:
-        run_testsuite(testsuite_x11_egl);
-        break;
+        return testsuite_x11_egl();
 #endif
-#endif // 0
     default:
         abort();
         break;
-- 
2.6.2