[clutter/clutter-1.16] conform: Drop the Cogl tests
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.16] conform: Drop the Cogl tests
- Date: Tue, 2 Jul 2013 21:39:21 +0000 (UTC)
commit 3dad01ac22cdb40c620ebef6f435de29ad672cee
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Jul 2 22:36:11 2013 +0100
conform: Drop the Cogl tests
Cogl has its own (way, way better) test suite these days, so we can drop
our own units here.
tests/conform/Makefile.am | 20 -
tests/conform/test-cogl-atlas-migration.c | 133 -------
tests/conform/test-cogl-fixed.c | 18 -
tests/conform/test-cogl-materials.c | 383 ------------------
tests/conform/test-cogl-multitexture.c | 208 ----------
tests/conform/test-cogl-npot-texture.c | 240 ------------
tests/conform/test-cogl-object.c | 86 ----
tests/conform/test-cogl-premult.c | 368 -----------------
tests/conform/test-cogl-readpixels.c | 174 --------
tests/conform/test-cogl-texture-get-set-data.c | 168 --------
tests/conform/test-cogl-texture-mipmaps.c | 137 -------
tests/conform/test-cogl-texture-pixmap-x11.c | 250 ------------
tests/conform/test-cogl-texture-rectangle.c | 307 ---------------
tests/conform/test-cogl-vertex-buffer-contiguous.c | 258 ------------
tests/conform/test-cogl-vertex-buffer-interleved.c | 158 --------
tests/conform/test-cogl-vertex-buffer-mutability.c | 199 ----------
tests/conform/test-cogl-viewport.c | 412 --------------------
tests/conform/test-conform-main.c | 27 --
18 files changed, 0 insertions(+), 3546 deletions(-)
---
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 7f57b1e..ae446aa 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -26,26 +26,6 @@ units_sources += \
timeline-rewind.c \
$(NULL)
-# cogl tests
-units_sources += \
- test-cogl-fixed.c \
- test-cogl-materials.c \
- test-cogl-viewport.c \
- test-cogl-multitexture.c \
- test-cogl-npot-texture.c \
- test-cogl-object.c \
- test-cogl-premult.c \
- test-cogl-readpixels.c \
- test-cogl-texture-get-set-data.c \
- test-cogl-texture-mipmaps.c \
- test-cogl-texture-pixmap-x11.c \
- test-cogl-texture-rectangle.c \
- test-cogl-atlas-migration.c \
- test-cogl-vertex-buffer-contiguous.c \
- test-cogl-vertex-buffer-interleved.c \
- test-cogl-vertex-buffer-mutability.c \
- $(NULL)
-
# actors tests
units_sources += \
actor-anchors.c \
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index a4698b0..d05c537 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -212,32 +212,5 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/events", events_touch);
-#if 0
- /* FIXME - see bug https://bugzilla.gnome.org/show_bug.cgi?id=655588 */
- TEST_CONFORM_TODO ("/cally", cally_text);
-
- TEST_CONFORM_SIMPLE ("/cogl", test_cogl_object);
- TEST_CONFORM_SIMPLE ("/cogl", test_cogl_fixed);
- TEST_CONFORM_SIMPLE ("/cogl", test_cogl_materials);
- TEST_CONFORM_SIMPLE ("/cogl", test_cogl_premult);
- TEST_CONFORM_SIMPLE ("/cogl", test_cogl_readpixels);
-
- TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_npot_texture);
- TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_multitexture);
- TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_mipmaps);
- TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_rectangle);
- TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_pixmap_x11);
- TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_get_set_data);
- TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_atlas_migration);
-
- TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_contiguous);
- TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_interleved);
- TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_mutability);
-
- /* left to the end because they aren't currently very orthogonal and tend to
- * break subsequent tests! */
- TEST_CONFORM_SIMPLE ("/cogl", test_cogl_viewport);
-#endif
-
return g_test_run ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]