From 8dc0489b335c422b5e66f12f0841b0fb48ccb785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 4 Aug 2022 20:06:41 +0200
Subject: [PATCH] tests/cogl: Migrate primitive tests

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2555>
---
 cogl/tests/conform/meson.build                          | 1 -
 cogl/tests/conform/test-conform-main.c                  | 2 --
 cogl/tests/conform/test-declarations.h                  | 1 -
 src/tests/cogl/conform/meson.build                      | 1 +
 {cogl/tests => src/tests/cogl}/conform/test-primitive.c | 9 ++++++---
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename {cogl/tests => src/tests/cogl}/conform/test-primitive.c (98%)

diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index 0cf1021d4..40f048602 100644
--- a/cogl/tests/conform/meson.build
+++ b/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',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index ae1b24aad..af523c82f 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/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);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index 4a31ad05f..123277e64 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/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);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index 7c02b443a..92d215094 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/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 = [
diff --git a/cogl/tests/conform/test-primitive.c b/src/tests/cogl/conform/test-primitive.c
similarity index 98%
rename from cogl/tests/conform/test-primitive.c
rename to src/tests/cogl/conform/test-primitive.c
index d013da310..b658ba839 100644
--- a/cogl/tests/conform/test-primitive.c
+++ b/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);
+)