[mutter] tests/cogl: Migrate depth test test
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] tests/cogl: Migrate depth test test
- Date: Mon, 8 Aug 2022 22:13:10 +0000 (UTC)
commit 8c41b3b4a1a2e9785be860a8a3c28d8b6cba5c39
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Thu Aug 4 19:15:27 2022 +0200
tests/cogl: Migrate depth test 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 -
src/tests/cogl/conform/meson.build | 1 +
{cogl/tests => src/tests/cogl}/conform/test-depth-test.c | 10 +++++-----
4 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index aea0ccd4b0..2b0026c6f5 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-depth-test.c',
'test-color-hsl.c',
'test-backface-culling.c',
'test-just-vertex-shader.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index b727f3b3a5..a55e09c7b6 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -62,7 +62,6 @@ main (int argc, char **argv)
ADD_TEST (test_pipeline_user_matrix, 0, 0);
ADD_TEST (test_premult, 0, 0);
UNPORTED_TEST (test_readpixels);
- ADD_TEST (test_depth_test, 0, 0);
ADD_TEST (test_backface_culling, 0, TEST_REQUIREMENT_NPOT);
ADD_TEST (test_layer_remove, 0, 0);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index a3a26f683c..6721037219 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -2,6 +2,7 @@ cogl_tests = [
'test-atlas-migration',
'test-blend-strings',
'test-blend',
+ 'test-depth-test',
]
cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-depth-test.c b/src/tests/cogl/conform/test-depth-test.c
similarity index 98%
rename from cogl/tests/conform/test-depth-test.c
rename to src/tests/cogl/conform/test-depth-test.c
index b6ed98d9d0..cc412d6fbd 100644
--- a/cogl/tests/conform/test-depth-test.c
+++ b/src/tests/cogl/conform/test-depth-test.c
@@ -1,11 +1,8 @@
-#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 QUAD_WIDTH 20
@@ -252,7 +249,7 @@ paint (TestState *state)
}
}
-void
+static void
test_depth_test (void)
{
TestState state;
@@ -269,3 +266,6 @@ test_depth_test (void)
g_print ("OK\n");
}
+COGL_TEST_SUITE (
+ g_test_add_func ("/depth-test", test_depth_test);
+)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]