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

diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index 183b9921b..2951aa191 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-wrap-modes.c',
   'test-sub-texture.c',
   'test-custom-attributes.c',
   'test-offscreen.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 46d034e5f..56dbb1aee 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -69,7 +69,6 @@ main (int argc, char **argv)
   UNPORTED_TEST (test_texture_mipmaps);
   ADD_TEST (test_sub_texture, 0, 0);
   UNPORTED_TEST (test_texture_rectangle);
-  ADD_TEST (test_wrap_modes, 0, 0);
   UNPORTED_TEST (test_texture_pixmap_x11);
   ADD_TEST (test_texture_get_set_data, 0, 0);
   ADD_TEST (test_read_texture_formats, 0, TEST_KNOWN_FAILURE);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index 45dfd7d57..506a31b1a 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/cogl/tests/conform/test-declarations.h
@@ -9,7 +9,6 @@ void test_layer_remove (void);
 void test_sparse_pipeline (void);
 void test_npot_texture (void);
 void test_sub_texture (void);
-void test_wrap_modes (void);
 void test_texture_get_set_data (void);
 void test_read_texture_formats (void);
 void test_write_texture_formats (void);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index 0aed3d1c6..4625ef5d5 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -11,6 +11,7 @@ cogl_tests = [
   'test-pixel-buffer',
   'test-premult',
   'test-snippets',
+  'test-wrap-modes',
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-wrap-modes.c b/src/tests/cogl/conform/test-wrap-modes.c
similarity index 98%
rename from cogl/tests/conform/test-wrap-modes.c
rename to src/tests/cogl/conform/test-wrap-modes.c
index 9bd525ebc..8d01dadd2 100644
--- a/cogl/tests/conform/test-wrap-modes.c
+++ b/src/tests/cogl/conform/test-wrap-modes.c
@@ -1,10 +1,7 @@
-#define COGL_VERSION_MIN_REQUIRED COGL_VERSION_1_0
-
 #include <cogl/cogl.h>
 #include <string.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 #define TEX_SIZE 4
 
@@ -225,7 +222,7 @@ paint (TestState *state)
   validate_result (state);
 }
 
-void
+static void
 test_wrap_modes (void)
 {
   TestState state;
@@ -245,3 +242,7 @@ test_wrap_modes (void)
   if (cogl_test_verbose ())
     g_print ("OK\n");
 }
+
+COGL_TEST_SUITE (
+  g_test_add_func ("/wrap-modes", test_wrap_modes);
+)