tests/cogl: Migrate primitive tests

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2555>

cogl/tests/conform/meson.build

@@ -1,6 +1,5 @@
 cogl_test_conformance_sources = [
   'test-conform-main.c',
-  'test-primitive.c',
   'test-sparse-pipeline.c',
   'test-read-texture-formats.c',
   'test-write-texture-formats.c',

cogl/tests/conform/test-conform-main.c

@@ -78,8 +78,6 @@ main (int argc, char **argv)
   UNPORTED_TEST (test_vertex_buffer_interleved);
   UNPORTED_TEST (test_vertex_buffer_mutability);
 
-  ADD_TEST (test_primitive, 0, 0);
-
   ADD_TEST (test_framebuffer_get_bits,
             TEST_REQUIREMENT_GL,
             0);

cogl/tests/conform/test-declarations.h

@@ -12,7 +12,6 @@ void test_texture_get_set_data (void);
 void test_read_texture_formats (void);
 void test_write_texture_formats (void);
 void test_alpha_textures (void);
-void test_primitive (void);
 void test_framebuffer_get_bits (void);
 void test_point_size (void);
 void test_point_size_attribute (void);

src/tests/cogl/conform/meson.build

@@ -16,6 +16,7 @@ cogl_tests = [
   'test-custom-attributes',
   'test-offscreen',
   'test-journal',
+  'test-primitive',
 ]
 
 cogl_test_conformance_includes = [

src/tests/cogl/conform/test-primitive.c

@@ -2,8 +2,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 typedef struct _TestState
 {
@@ -312,7 +311,7 @@ test_copy (TestState *state)
   cogl_object_unref (buffer);
 }
 
-void
+static void
 test_primitive (void)
 {
   TestState state;
@@ -333,3 +332,7 @@ test_primitive (void)
   if (cogl_test_verbose ())
     g_print ("OK\n");
 }
+
+COGL_TEST_SUITE (
+  g_test_add_func ("/primitive", test_primitive);
+)