[clutter] tests: Remove conformance tests that have been ported to Cogl



commit 0f04a1cd11500c943b41351ea603331f0bc6d746
Author: Neil Roberts <neil linux intel com>
Date:   Fri Feb 10 10:46:25 2012 +0000

    tests: Remove conformance tests that have been ported to Cogl
    
    A lot of the conformance tests that were just testing Cogl
    functionality have been ported to be standalone Cogl tests in the Cogl
    source tree. This patch removes those from Clutter so we don't have to
    maintain them in two places.
    
    Reviewed-by: Emmanuele Bassi <ebassi linux intel com>

 tests/conform/Makefile.am                      |   11 -
 tests/conform/test-cogl-backface-culling.c     |  340 -------------------
 tests/conform/test-cogl-blend-strings.c        |  433 ------------------------
 tests/conform/test-cogl-depth-test.c           |  336 ------------------
 tests/conform/test-cogl-just-vertex-shader.c   |  138 --------
 tests/conform/test-cogl-offscreen.c            |  163 ---------
 tests/conform/test-cogl-path.c                 |  235 -------------
 tests/conform/test-cogl-pipeline-user-matrix.c |  146 --------
 tests/conform/test-cogl-primitive.c            |  245 -------------
 tests/conform/test-cogl-sub-texture.c          |  368 --------------------
 tests/conform/test-cogl-texture-3d.c           |  230 -------------
 tests/conform/test-cogl-wrap-modes.c           |  319 -----------------
 tests/conform/test-conform-main.c              |   13 -
 13 files changed, 0 insertions(+), 2977 deletions(-)
---
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 59d5e3e..28e2ef0 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -27,23 +27,15 @@ units_sources += \
 
 # cogl tests
 units_sources += \
-	test-cogl-backface-culling.c 		\
-	test-cogl-blend-strings.c		\
-	test-cogl-depth-test.c			\
 	test-cogl-fixed.c 			\
 	test-cogl-materials.c			\
-	test-cogl-pipeline-user-matrix.c	\
 	test-cogl-viewport.c			\
 	test-cogl-multitexture.c        	\
 	test-cogl-npot-texture.c        	\
 	test-cogl-object.c			\
-	test-cogl-offscreen.c			\
-	test-cogl-path.c			\
 	test-cogl-pixel-buffer.c		\
 	test-cogl-premult.c			\
 	test-cogl-readpixels.c			\
-	test-cogl-sub-texture.c         	\
-	test-cogl-texture-3d.c          	\
 	test-cogl-texture-get-set-data.c 	\
 	test-cogl-texture-mipmaps.c     	\
 	test-cogl-texture-pixmap-x11.c  	\
@@ -52,9 +44,6 @@ units_sources += \
 	test-cogl-vertex-buffer-contiguous.c 	\
 	test-cogl-vertex-buffer-interleved.c 	\
 	test-cogl-vertex-buffer-mutability.c 	\
-	test-cogl-wrap-modes.c          	\
-	test-cogl-primitive.c			\
-	test-cogl-just-vertex-shader.c		\
 	$(NULL)
 
 # actors tests
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index c2aba65..2157450 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -234,23 +234,15 @@ main (int argc, char **argv)
 
   TEST_CONFORM_SIMPLE ("/cogl", test_cogl_object);
   TEST_CONFORM_SIMPLE ("/cogl", test_cogl_fixed);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_backface_culling);
   TEST_CONFORM_SIMPLE ("/cogl", test_cogl_materials);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_pipeline_user_matrix);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_blend_strings);
   TEST_CONFORM_SIMPLE ("/cogl", test_cogl_premult);
   TEST_CONFORM_SIMPLE ("/cogl", test_cogl_readpixels);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_path);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_depth_test);
 
   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_sub_texture);
   TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_pixel_array);
   TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_rectangle);
-  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_3d);
-  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_wrap_modes);
   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);
@@ -259,14 +251,9 @@ main (int argc, char **argv)
   TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_interleved);
   TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_mutability);
 
-  TEST_CONFORM_SIMPLE ("/cogl/vertex-array", test_cogl_primitive);
-
-  TEST_CONFORM_SIMPLE ("/cogl/shaders", test_cogl_just_vertex_shader);
-
   /* left to the end because they aren't currently very orthogonal and tend to
    * break subsequent tests! */
   TEST_CONFORM_SIMPLE ("/cogl", test_cogl_viewport);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_offscreen);
 
   return g_test_run ();
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]