[mutter] tests/cogl: Migrate blend test

[Marge Bot <marge-bot src gnome org>]

commit 67a9226e92690c3e89e9cfb75b1e5fd4cc5664f6
Author: Jonas Ådahl <jadahl gmail com>
Date:   Thu Aug 4 19:10:53 2022 +0200

    tests/cogl: Migrate blend 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-blend.c | 8 +++++---
 5 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index 051423bbeb..aea0ccd4b0 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.c',
   'test-depth-test.c',
   'test-color-hsl.c',
   'test-backface-culling.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 541b4202b8..b727f3b3a5 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, 0, 0);
   ADD_TEST (test_premult, 0, 0);
   UNPORTED_TEST (test_readpixels);
   ADD_TEST (test_depth_test, 0, 0);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index f2af32545d..5f238dd37a 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 (void);
 void test_premult (void);
 void test_path (void);
 void test_path_clip (void);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index f28b31ac10..a3a26f683c 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -1,6 +1,7 @@
 cogl_tests = [
   'test-atlas-migration',
   'test-blend-strings',
+  'test-blend',
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-blend.c b/src/tests/cogl/conform/test-blend.c
similarity index 94%
rename from cogl/tests/conform/test-blend.c
rename to src/tests/cogl/conform/test-blend.c
index 99c1e4687d..4418672bba 100644
--- a/cogl/tests/conform/test-blend.c
+++ b/src/tests/cogl/conform/test-blend.c
@@ -2,8 +2,7 @@
 
 #include <string.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 static void
 paint (void)
@@ -51,7 +50,7 @@ paint (void)
                                     0x80808080);
 }
 
-void
+static void
 test_blend (void)
 {
   cogl_framebuffer_orthographic (test_fb, 0, 0,
@@ -63,3 +62,6 @@ test_blend (void)
   paint ();
 }
 
+COGL_TEST_SUITE (
+  g_test_add_func ("/blend", test_blend);
+)