[mutter] cogl: Remove now empty conform test suite
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Remove now empty conform test suite
- Date: Mon, 8 Aug 2022 22:13:12 +0000 (UTC)
commit 4ebaa433ee28c75cff7e14cf70000580d8ec5f17
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Thu Aug 4 23:22:54 2022 +0200
cogl: Remove now empty conform test suite
All working tests have already migrated to the test suite using mutter;
move the old unported tests over too, and remove the conform test
framework, as it is no longer used.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2555>
cogl/tests/conform/meson.build | 86 ----------------------
.../tests/conform/meson/find-conform-unit-tests.sh | 8 --
cogl/tests/conform/mutter-cogl.test.in | 6 --
cogl/tests/conform/test-conform-main.c | 78 --------------------
cogl/tests/conform/test-declarations.h | 12 ---
cogl/tests/conform/test-fixtures.c | 12 ---
cogl/tests/meson.build | 1 -
src/tests/cogl/conform/meson.build | 10 +++
.../tests/cogl}/conform/test-multitexture.c | 0
.../tests => src/tests/cogl}/conform/test-object.c | 0
.../tests/cogl}/conform/test-readpixels.c | 0
.../tests/cogl}/conform/test-texture-mipmaps.c | 0
.../tests/cogl}/conform/test-texture-pixmap-x11.c | 0
.../tests/cogl}/conform/test-viewport.c | 0
14 files changed, 10 insertions(+), 203 deletions(-)
---
diff --git a/cogl/tests/meson.build b/cogl/tests/meson.build
index 0d76c8bc9e..12a8494d3d 100644
--- a/cogl/tests/meson.build
+++ b/cogl/tests/meson.build
@@ -18,5 +18,4 @@ cogl_config_env = configure_file(
install_dir: cogl_installed_tests_libexecdir,
)
-subdir('conform')
subdir('unit')
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index 03781774c0..e076733a58 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -41,6 +41,16 @@ cogl_tests = [
[ 'test-fence', [] ],
]
+#unported = [
+# "test-multitexture",
+# "test-npot-texture",
+# "test-object",
+# "test-readpixels",
+# "test-texture-mipmaps",
+# "test-texture-pixmap-x11",
+# "test-viewport",
+#]
+
cogl_test_conformance_includes = [
tests_includepath,
cogl_includepath,
diff --git a/cogl/tests/conform/test-multitexture.c b/src/tests/cogl/conform/test-multitexture.c
similarity index 100%
rename from cogl/tests/conform/test-multitexture.c
rename to src/tests/cogl/conform/test-multitexture.c
diff --git a/cogl/tests/conform/test-object.c b/src/tests/cogl/conform/test-object.c
similarity index 100%
rename from cogl/tests/conform/test-object.c
rename to src/tests/cogl/conform/test-object.c
diff --git a/cogl/tests/conform/test-readpixels.c b/src/tests/cogl/conform/test-readpixels.c
similarity index 100%
rename from cogl/tests/conform/test-readpixels.c
rename to src/tests/cogl/conform/test-readpixels.c
diff --git a/cogl/tests/conform/test-texture-mipmaps.c b/src/tests/cogl/conform/test-texture-mipmaps.c
similarity index 100%
rename from cogl/tests/conform/test-texture-mipmaps.c
rename to src/tests/cogl/conform/test-texture-mipmaps.c
diff --git a/cogl/tests/conform/test-texture-pixmap-x11.c b/src/tests/cogl/conform/test-texture-pixmap-x11.c
similarity index 100%
rename from cogl/tests/conform/test-texture-pixmap-x11.c
rename to src/tests/cogl/conform/test-texture-pixmap-x11.c
diff --git a/cogl/tests/conform/test-viewport.c b/src/tests/cogl/conform/test-viewport.c
similarity index 100%
rename from cogl/tests/conform/test-viewport.c
rename to src/tests/cogl/conform/test-viewport.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]