From 09990f8bcc3ce0bdb020dd1f335556da73dc0092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 4 Aug 2022 22:07:37 +0200 Subject: [PATCH] tests/cogl: Migrate texture get/set data test Part-of: --- 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-texture-get-set-data.c | 9 ++++++--- 5 files changed, 7 insertions(+), 6 deletions(-) rename {cogl/tests => src/tests/cogl}/conform/test-texture-get-set-data.c (96%) diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build index 27d9451f1..78a3fc6a8 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-texture-get-set-data.c', 'test-framebuffer-get-bits.c', 'test-primitive-and-journal.c', 'test-copy-replace-texture.c', diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c index 8cc12b60b..b2f06ff2f 100644 --- a/cogl/tests/conform/test-conform-main.c +++ b/cogl/tests/conform/test-conform-main.c @@ -65,7 +65,6 @@ main (int argc, char **argv) UNPORTED_TEST (test_texture_mipmaps); UNPORTED_TEST (test_texture_rectangle); UNPORTED_TEST (test_texture_pixmap_x11); - ADD_TEST (test_texture_get_set_data, 0, 0); UNPORTED_TEST (test_vertex_buffer_contiguous); UNPORTED_TEST (test_vertex_buffer_interleved); diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h index cc8ce7876..9d138f6fe 100644 --- a/cogl/tests/conform/test-declarations.h +++ b/cogl/tests/conform/test-declarations.h @@ -5,7 +5,6 @@ void test_path (void); void test_path_clip (void); void test_depth_test (void); void test_backface_culling (void); -void test_texture_get_set_data (void); void test_framebuffer_get_bits (void); void test_primitive_and_journal (void); void test_copy_replace_texture (void); diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build index bae45967a..301ad8e12 100644 --- a/src/tests/cogl/conform/meson.build +++ b/src/tests/cogl/conform/meson.build @@ -30,6 +30,7 @@ cogl_tests = [ [ 'test-map-buffer-range', [] ], [ 'test-npot-texture', [] ], [ 'test-alpha-textures', [] ], + [ 'test-texture-get-set-data', [] ], ] cogl_test_conformance_includes = [ diff --git a/cogl/tests/conform/test-texture-get-set-data.c b/src/tests/cogl/conform/test-texture-get-set-data.c similarity index 96% rename from cogl/tests/conform/test-texture-get-set-data.c rename to src/tests/cogl/conform/test-texture-get-set-data.c index 6bc68b387..fd69db02c 100644 --- a/cogl/tests/conform/test-texture-get-set-data.c +++ b/src/tests/cogl/conform/test-texture-get-set-data.c @@ -2,8 +2,7 @@ #include -#include "test-declarations.h" -#include "test-utils.h" +#include "tests/cogl-test-utils.h" static void check_texture (int width, int height, TestUtilsTextureFlags flags) @@ -129,7 +128,7 @@ check_texture (int width, int height, TestUtilsTextureFlags flags) g_free (data); } -void +static void test_texture_get_set_data (void) { /* First try without atlasing */ @@ -143,3 +142,7 @@ test_texture_get_set_data (void) /* And in the other direction. */ check_texture (5128, 4, TEST_UTILS_TEXTURE_NO_ATLAS); } + +COGL_TEST_SUITE ( + g_test_add_func ("/texture/get-set-data", test_texture_get_set_data); +)