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

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

diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index ff606e3fc..183b9921b 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-snippets.c',
   'test-wrap-modes.c',
   'test-sub-texture.c',
   'test-custom-attributes.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 8d9e8250f..46d034e5f 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -82,7 +82,6 @@ main (int argc, char **argv)
 
   ADD_TEST (test_primitive, 0, 0);
 
-  ADD_TEST (test_snippets, 0, 0);
   ADD_TEST (test_custom_attributes, 0, 0);
 
   ADD_TEST (test_offscreen, 0, 0);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index 5e6c7b9ab..45dfd7d57 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/cogl/tests/conform/test-declarations.h
@@ -15,7 +15,6 @@ void test_read_texture_formats (void);
 void test_write_texture_formats (void);
 void test_alpha_textures (void);
 void test_primitive (void);
-void test_snippets (void);
 void test_custom_attributes (void);
 void test_offscreen (void);
 void test_journal_unref_flush (void);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index a275889cd..0aed3d1c6 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -10,6 +10,7 @@ cogl_tests = [
   'test-pipeline-uniforms',
   'test-pixel-buffer',
   'test-premult',
+  'test-snippets',
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-snippets.c b/src/tests/cogl/conform/test-snippets.c
similarity index 99%
rename from cogl/tests/conform/test-snippets.c
rename to src/tests/cogl/conform/test-snippets.c
index 5ed3d8d0f..7c13ba5b2 100644
--- a/cogl/tests/conform/test-snippets.c
+++ b/src/tests/cogl/conform/test-snippets.c
@@ -2,8 +2,7 @@
 
 #include <string.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 typedef struct _TestState
 {
@@ -796,7 +795,7 @@ run_tests (TestState *state)
     }
 }
 
-void
+static void
 test_snippets (void)
 {
   TestState state;
@@ -816,3 +815,7 @@ test_snippets (void)
   if (cogl_test_verbose ())
     g_print ("OK\n");
 }
+
+COGL_TEST_SUITE (
+  g_test_add_func ("/snippets", test_snippets);
+)