From 2746861c6ac69791bfeefc82b8e7ce13c3e71333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 4 Aug 2022 20:29:41 +0200 Subject: [PATCH] tests/cogl: Migrate point size 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 + {cogl/tests => src/tests/cogl}/conform/test-point-size.c | 9 ++++++--- 5 files changed, 7 insertions(+), 6 deletions(-) rename {cogl/tests => src/tests/cogl}/conform/test-point-size.c (96%) diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build index 0b1399798..d4b9d3313 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-point-size.c', 'test-point-size-attribute.c', 'test-point-sprite.c', 'test-no-gl-header.c', diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c index 1e8132f94..c871ddea4 100644 --- a/cogl/tests/conform/test-conform-main.c +++ b/cogl/tests/conform/test-conform-main.c @@ -78,7 +78,6 @@ main (int argc, char **argv) TEST_REQUIREMENT_GL, 0); - ADD_TEST (test_point_size, 0, 0); ADD_TEST (test_point_size_attribute, 0, 0); ADD_TEST (test_point_size_attribute_snippet, diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h index 933fc26df..634634937 100644 --- a/cogl/tests/conform/test-declarations.h +++ b/cogl/tests/conform/test-declarations.h @@ -10,7 +10,6 @@ void test_npot_texture (void); void test_texture_get_set_data (void); void test_alpha_textures (void); void test_framebuffer_get_bits (void); -void test_point_size (void); void test_point_size_attribute (void); void test_point_size_attribute_snippet (void); void test_point_sprite (void); diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build index d5bb35884..2e65da6f0 100644 --- a/src/tests/cogl/conform/meson.build +++ b/src/tests/cogl/conform/meson.build @@ -20,6 +20,7 @@ cogl_tests = [ [ 'test-sparse-pipeline', [] ], [ 'test-read-texture-formats', ['gl', 'gl3'] ], [ 'test-write-texture-formats', [] ], + [ 'test-point-size', [] ], ] cogl_test_conformance_includes = [ diff --git a/cogl/tests/conform/test-point-size.c b/src/tests/cogl/conform/test-point-size.c similarity index 96% rename from cogl/tests/conform/test-point-size.c rename to src/tests/cogl/conform/test-point-size.c index 92148a0e6..54ae07bc2 100644 --- a/cogl/tests/conform/test-point-size.c +++ b/src/tests/cogl/conform/test-point-size.c @@ -1,7 +1,6 @@ #include -#include "test-declarations.h" -#include "test-utils.h" +#include "tests/cogl-test-utils.h" /* This test assumes the GL driver supports point sizes up to 16 pixels. Cogl should probably have some way of querying the size so @@ -46,7 +45,7 @@ verify_point_size (CoglFramebuffer *test_fb, } } -void +static void test_point_size (void) { int fb_width = cogl_framebuffer_get_width (test_fb); @@ -99,3 +98,7 @@ test_point_size (void) if (cogl_test_verbose ()) g_print ("OK\n"); } + +COGL_TEST_SUITE ( + g_test_add_func ("/point-size", test_point_size); +)