From 5e92500a9adca70509151f4421914d6dfaf6aaa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 4 Aug 2022 19:03:19 +0200
Subject: [PATCH] tests/cogl: Migrate blend-strings 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 +
 .../tests => src/tests/cogl}/conform/test-blend-strings.c | 8 +++++---
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename {cogl/tests => src/tests/cogl}/conform/test-blend-strings.c (99%)

diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index af621267c..051423bbe 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-blend-strings.c',
   'test-blend.c',
   'test-depth-test.c',
   'test-color-hsl.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index b17497e21..541b4202b 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -60,7 +60,6 @@ main (int argc, char **argv)
   UNPORTED_TEST (test_fixed);
   UNPORTED_TEST (test_materials);
   ADD_TEST (test_pipeline_user_matrix, 0, 0);
-  ADD_TEST (test_blend_strings, 0, 0);
   ADD_TEST (test_blend, 0, 0);
   ADD_TEST (test_premult, 0, 0);
   UNPORTED_TEST (test_readpixels);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index 5116f82b7..f2af32545 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/cogl/tests/conform/test-declarations.h
@@ -2,7 +2,6 @@
 #define COGL_TEST_DECLARATIONS_H
 
 void test_pipeline_user_matrix (void);
-void test_blend_strings (void);
 void test_blend (void);
 void test_premult (void);
 void test_path (void);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index 15daad65a..f28b31ac1 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -1,5 +1,6 @@
 cogl_tests = [
   'test-atlas-migration',
+  'test-blend-strings',
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-blend-strings.c b/src/tests/cogl/conform/test-blend-strings.c
similarity index 99%
rename from cogl/tests/conform/test-blend-strings.c
rename to src/tests/cogl/conform/test-blend-strings.c
index d440a5eaf..98ffa749e 100644
--- a/cogl/tests/conform/test-blend-strings.c
+++ b/src/tests/cogl/conform/test-blend-strings.c
@@ -2,8 +2,7 @@
 
 #include <string.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 #define QUAD_WIDTH 20
 
@@ -357,7 +356,7 @@ paint (TestState *state)
                     0x2a2a2abb); /* expected */
 }
 
-void
+static void
 test_blend_strings (void)
 {
   TestState state;
@@ -374,3 +373,6 @@ test_blend_strings (void)
     g_print ("OK\n");
 }
 
+COGL_TEST_SUITE (
+  g_test_add_func ("/blend-strings", test_blend_strings);
+)