tests/cogl: Migrate primitive tests

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2555>
This commit is contained in:
Jonas Ådahl 2022-08-04 20:06:41 +02:00 committed by Marge Bot
parent 559c9c8795
commit 8dc0489b33
5 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,5 @@
cogl_test_conformance_sources = [ cogl_test_conformance_sources = [
'test-conform-main.c', 'test-conform-main.c',
'test-primitive.c',
'test-sparse-pipeline.c', 'test-sparse-pipeline.c',
'test-read-texture-formats.c', 'test-read-texture-formats.c',
'test-write-texture-formats.c', 'test-write-texture-formats.c',

View File

@ -78,8 +78,6 @@ main (int argc, char **argv)
UNPORTED_TEST (test_vertex_buffer_interleved); UNPORTED_TEST (test_vertex_buffer_interleved);
UNPORTED_TEST (test_vertex_buffer_mutability); UNPORTED_TEST (test_vertex_buffer_mutability);
ADD_TEST (test_primitive, 0, 0);
ADD_TEST (test_framebuffer_get_bits, ADD_TEST (test_framebuffer_get_bits,
TEST_REQUIREMENT_GL, TEST_REQUIREMENT_GL,
0); 0);

View File

@ -12,7 +12,6 @@ void test_texture_get_set_data (void);
void test_read_texture_formats (void); void test_read_texture_formats (void);
void test_write_texture_formats (void); void test_write_texture_formats (void);
void test_alpha_textures (void); void test_alpha_textures (void);
void test_primitive (void);
void test_framebuffer_get_bits (void); void test_framebuffer_get_bits (void);
void test_point_size (void); void test_point_size (void);
void test_point_size_attribute (void); void test_point_size_attribute (void);

View File

@ -16,6 +16,7 @@ cogl_tests = [
'test-custom-attributes', 'test-custom-attributes',
'test-offscreen', 'test-offscreen',
'test-journal', 'test-journal',
'test-primitive',
] ]
cogl_test_conformance_includes = [ cogl_test_conformance_includes = [

View File

@ -2,8 +2,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "test-declarations.h" #include "tests/cogl-test-utils.h"
#include "test-utils.h"
typedef struct _TestState typedef struct _TestState
{ {
@ -312,7 +311,7 @@ test_copy (TestState *state)
cogl_object_unref (buffer); cogl_object_unref (buffer);
} }
void static void
test_primitive (void) test_primitive (void)
{ {
TestState state; TestState state;
@ -333,3 +332,7 @@ test_primitive (void)
if (cogl_test_verbose ()) if (cogl_test_verbose ())
g_print ("OK\n"); g_print ("OK\n");
} }
COGL_TEST_SUITE (
g_test_add_func ("/primitive", test_primitive);
)