Revision: 31202 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31202 Author: leifandersen Date: 2010-08-10 00:21:22 +0200 (Tue, 10 Aug 2010)
Log Message: ----------- 1. Cleaned up the names in the tests, so that you don't see the whole fileptath while the tests are running. 2. Added the sequencer and mesh modeling tests into the syndicate, allthough they fail at the moment. 3. Moved faceselect the manual folder, as it's a GUI test. 4. Fixed the Window and world tests which recently started crashing. Modified Paths: -------------- branches/soc-2010-leifandersen/tests/CMakeLists.txt branches/soc-2010-leifandersen/tests/data/data/CMakeLists.txt branches/soc-2010-leifandersen/tests/export_import_testing/CMakeLists.txt branches/soc-2010-leifandersen/tests/hashfile.txt branches/soc-2010-leifandersen/tests/physics/CMakeLists.txt branches/soc-2010-leifandersen/tests/python/CMakeLists.txt branches/soc-2010-leifandersen/tests/python/Window_example1.py branches/soc-2010-leifandersen/tests/python/World_example1.py Added Paths: ----------- branches/soc-2010-leifandersen/tests/manual/faceselectmode.blend branches/soc-2010-leifandersen/tests/mesh_modeling/CMakeLists.txt branches/soc-2010-leifandersen/tests/sequence_editing/CMakeLists.txt Removed Paths: ------------- branches/soc-2010-leifandersen/tests/mesh_modeling/faceselectmode.blend Modified: branches/soc-2010-leifandersen/tests/CMakeLists.txt =================================================================== --- branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-08-09 21:54:17 UTC (rev 31201) +++ branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-08-09 22:21:22 UTC (rev 31202) @@ -29,4 +29,6 @@ ADD_SUBDIRECTORY(physics) ADD_SUBDIRECTORY(python) ADD_SUBDIRECTORY(render) -ADD_SUBDIRECtoRY(addon) +ADD_SUBDIRECTORY(addon) +ADD_SUBDIRECTORY(sequence_editing) +ADD_SUBDIRECTORY(mesh_modeling) Modified: branches/soc-2010-leifandersen/tests/data/data/CMakeLists.txt =================================================================== --- branches/soc-2010-leifandersen/tests/data/data/CMakeLists.txt 2010-08-09 21:54:17 UTC (rev 31201) +++ branches/soc-2010-leifandersen/tests/data/data/CMakeLists.txt 2010-08-09 22:21:22 UTC (rev 31202) @@ -1,10 +1,14 @@ FILE(GLOB SRC *.py) -FOREACH(NAME ${SRC}) - ADD_TEST(DA_${NAME} ${Blender_BINARY_DIR}/bin/blender -P ${NAME} +STRING(REGEX REPLACE ${Blender_SOURCE_DIR} ";${Blender_BINARY_DIR}" BIN ${SRC}) + +FOREACH(PATH ${BIN}) + STRING(REGEX REPLACE "${Blender_BINARY_DIR}/tests/data/data/" "" NAME ${PATH}) + ADD_TEST(DA_${NAME} ${Blender_BINARY_DIR}/bin/blender + -P ${PATH} ) SET_TESTS_PROPERTIES(DA_${NAME} PROPERTIES PASS_REGULAR_EXPRESSION "OK" TIMEOUT 10 ) -ENDFOREACH(NAME) +ENDFOREACH(PATH) Modified: branches/soc-2010-leifandersen/tests/export_import_testing/CMakeLists.txt =================================================================== --- branches/soc-2010-leifandersen/tests/export_import_testing/CMakeLists.txt 2010-08-09 21:54:17 UTC (rev 31201) +++ branches/soc-2010-leifandersen/tests/export_import_testing/CMakeLists.txt 2010-08-09 22:21:22 UTC (rev 31202) @@ -1,11 +1,14 @@ FILE(GLOB SRC */*.blend) -FOREACH(NAME ${SRC}) - ADD_TEST(EI_${NAME} ${Blender_BINARY_DIR}/bin/blender ${NAME} +STRING(REGEX REPLACE ${Blender_SOURCE_DIR} ";${Blender_BINARY_DIR}" BIN ${SRC}) + +FOREACH(PATH ${BIN}) + STRING(REGEX REPLACE "${Blender_BINARY_DIR}/tests/export_import_testing/" "" NAME ${PATH}) + ADD_TEST(EI_${NAME} ${Blender_BINARY_DIR}/bin/blender ${PATH} -P ${Blender_BINARY_DIR}/bin/hash_compare.py ) SET_TESTS_PROPERTIES(EI_${NAME} PROPERTIES PASS_REGULAR_EXPRESSION "OK" TIMEOUT 10 ) -ENDFOREACH(NAME) +ENDFOREACH(PATH) Modified: branches/soc-2010-leifandersen/tests/hashfile.txt =================================================================== --- branches/soc-2010-leifandersen/tests/hashfile.txt 2010-08-09 21:54:17 UTC (rev 31201) +++ branches/soc-2010-leifandersen/tests/hashfile.txt 2010-08-09 22:21:22 UTC (rev 31202) @@ -1,92 +1,97 @@ MetaBall_example.py.blend = 42bb5fa044bbca6e6a37218baafa56a8 -all_quads.blend = 54914b465ab7f1677f94b29836e49285 -boids.blend = ef5a44c8091a70b48aee825119705ac6 +all_quads.blend = 77c51c0ca2339558db5f23d2da2c7b97 +boids.blend = 9ee5f46b11b57e4f53a9035a89d95492 MetaBall_example.py.blend_start = 75dd4cc5fcb018077febc70b0c329cc2 Timeline.py.blend_end = -21460235683897623202 -Group_example2.py.blend_end = 189181dc90d5bf3e08049689c46240a7 -softbodytest.blend = 1e5c135516db1a1f06835c705db590eb +Group_example2.py.blend_end = ca64423cf2c10fb112089df19f5196c2 +softbodytest.blend = c1d501be86115133811448b98edfa8b1 Font_example.py.blend_end = dba4317142a24193be16c95f438bfe6b Text3d_example.py.blend_end = dba4317142a24193be16c95f438bfe6b -radioroom.blend = 52e443a5c5619ed0c98be433046d46bc +radioroom.blend = 63435dbd9d61abe8df5d2734fdf5cab4 Mesh_example.py.blend_start = 75dd4cc5fcb018077febc70b0c329cc2 -lamp_modes_example.py.blend_start = 7a19f34e52ccc7a57bdf10cae658878d +lamp_modes_example.py.blend_start = e6fe1762c461250af7b32fa07c531f65 Text_example.py.blend = a948c91b9df848f8075da24a07ddcc24 -Window_example1.py.blend_start = a948c91b9df848f8075da24a07ddcc24 -Timeline.py.blend_start = a948c91b9df848f8075da24a07ddcc24 +Window_example1.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 +Timeline.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 World_example2.py.blend = a948c91b9df848f8075da24a07ddcc24 Armature_example2.py.blend = 9de007b901061739811b635d8458b6df Font_example.py.blend_start = 75dd4cc5fcb018077febc70b0c329cc2 Timeline.py.blend = a948c91b9df848f8075da24a07ddcc24 -Render_example.py.blend_start = a948c91b9df848f8075da24a07ddcc24 +Render_example.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 Sound_example.py.blend = a948c91b9df848f8075da24a07ddcc24 -World_example1.py.blend_start = a948c91b9df848f8075da24a07ddcc24 +World_example1.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 Scene_example.py.blend = ef1c76a03a6a99091c1b1fea7f05853d -Object_example.py.blend_end = c8b2f049e8bf63de317ee97226bb3b55 +Object_example.py.blend_end = 8fb8cd0fb62980a6ba69277ea82293a5 MetaBall_example.py.blend_end = 42bb5fa044bbca6e6a37218baafa56a8 Text3d_example.py.blend_start = 75dd4cc5fcb018077febc70b0c329cc2 -Modifier_example.py.blend_end = 1a82af6cee97145e5e751b86d97e6ddf -Window_example1.py.blend_end = a948c91b9df848f8075da24a07ddcc24 -Render_example.py.blend_end = a948c91b9df848f8075da24a07ddcc24 +Modifier_example.py.blend_end = 107be36258788e3044e2ef2e473e2b18 +Window_example1.py.blend_end = 28420b68a263d71a4bb4fe880e0918c8 +Render_example.py.blend_end = 28420b68a263d71a4bb4fe880e0918c8 Camera_example.py.blend = 162f9530673617327d030d26e716ee34 -lamp_modes_example.py.blend_end = 38abb432cb47f2e08072664bc4507139 +lamp_modes_example.py.blend_end = 28b40cacda48094acc054b6f0ff248f9 MeshPrimitives_example.py.blend = 41b9d75cf0a53c79a5cb3d68a10ec7a5 -Types_example.py.blend_end = a948c91b9df848f8075da24a07ddcc24 +Types_example.py.blend_end = 28420b68a263d71a4bb4fe880e0918c8 Font_example.py.blend = dba4317142a24193be16c95f438bfe6b -fluidsim.blend = 8cad819d1e7665975ed569d98041929f +fluidsim.blend = 674afda61fc48e5992744db0e58b3d22 Constraint_example1.py.blend = 686dd74c73ad6f051ae1fe7f880d9dfe -particle_extras_effector.blend = d5d03261dc58087b1da9fc9a7bbc9754 -World_example2.py.blend_end = a948c91b9df848f8075da24a07ddcc24 -particle_children_hair.blend = 773e5250e839e76b7908a4cf9330a6cb +particle_extras_effector.blend = ac6c08f2a9934b5d0c4c692c13f5a22a +World_example2.py.blend_end = 28420b68a263d71a4bb4fe880e0918c8 +particle_children_hair.blend = d73e590c102cb15efb844039ece2daca Render_example.py.blend = a948c91b9df848f8075da24a07ddcc24 Group_example2.py.blend = 189181dc90d5bf3e08049689c46240a7 -softhairtest.blend = 2bda18be551373f9828d47f41e45423d -Text_example.py.blend_start = a948c91b9df848f8075da24a07ddcc24 -Modifier_example.py.blend_start = a948c91b9df848f8075da24a07ddcc24 +softhairtest.blend = 2d41637399aa41b283f11cda68e6da7e +Text_example.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 +Modifier_example.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 Object_example.py.blend = c8b2f049e8bf63de317ee97226bb3b55 Mesh_example.py.blend = 3c6a4371324394ef94cff62479913167 -continue_physics.blend = 7b9a2bf400661da693c95d613b5dd32c -all_tris.blend = fc3c49d8c65424725bc3d3dd66f647ab -image_example.py.blend_start = a948c91b9df848f8075da24a07ddcc24 -Sound_example.py.blend_start = a948c91b9df848f8075da24a07ddcc24 +continue_physics.blend = e15c7f112dbf3b573f54641be2751788 +all_tris.blend = 90e1f3c0a1a4e28e1dd53f213fcb8065 +image_example.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 +Sound_example.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 World_example1.py.blend = a948c91b9df848f8075da24a07ddcc24 NURBS.blend = aac8e75f15290279064329a765652e79 -World_example1.py.blend_end = -21460235683897623202 +World_example1.py.blend_end = 73bab1a783146478da715ef2e53cf3e6 Armature_example2.py.blend_start = 90299460fa245a371c8eb2de2e929d58 -Constraint_example2.py.blend_start = cbac6aa87b2f735cee63e77a45ae7624 -Camera_example.py.blend_end = 162f9530673617327d030d26e716ee34 -softbody_basics.blend = 2c44b33d009d6105cbad2d4e100ea336 -effect_example.py.blend_end = 32e1a17f2204a7644fac466e9ac7367d -World_example2.py.blend_start = a948c91b9df848f8075da24a07ddcc24 +Constraint_example2.py.blend_start = daaae130b14b2cd053ead572fdf1600c +Camera_example.py.blend_end = bb5374c012220ec9454542dd658b2dcd +softbody_basics.blend = 3b2be2e8aef60b430af4e2c4a0343c7a +effect_example.py.blend_end = 7486006d2508592ff5425d076a4f2b83 +World_example2.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 edges.blend = 0e1b3b0cd3c7fce5df3cd4b71d99e03a -Types_example.py.blend_start = a948c91b9df848f8075da24a07ddcc24 -Scene_example.py.blend_end = ef1c76a03a6a99091c1b1fea7f05853d -Constraint_example1.py.blend_end = 686dd74c73ad6f051ae1fe7f880d9dfe +Types_example.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 +Scene_example.py.blend_end = fac1ebaecd47304c3013587569442d9b +Constraint_example1.py.blend_end = c9a518a8835adde329d57bc4b9a6dd3c Types_example.py.blend = a948c91b9df848f8075da24a07ddcc24 Sound_example.py.blend_end = -21460235683897623202 -MeshPrimitives_example.py.blend_end = 41b9d75cf0a53c79a5cb3d68a10ec7a5 -fountain.blend = 259d3427fd8244cf871cdbb63626e08d +MeshPrimitives_example.py.blend_end = 5bb5ffd5f35b93459ef00fb377d645b5 +fountain.blend = 31544892f7dae1ed03e6f2cbed45be94 vertices.blend = aac8e75f15290279064329a765652e79 -Constraint_example2.py.blend_end = cbac6aa87b2f735cee63e77a45ae7624 +Constraint_example2.py.blend_end = daaae130b14b2cd053ead572fdf1600c Constraint_example2.py.blend = cbac6aa87b2f735cee63e77a45ae7624 -Camera_example.py.blend_start = a948c91b9df848f8075da24a07ddcc24 +Camera_example.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 effect_example.py.blend = 32e1a17f2204a7644fac466e9ac7367d -mixed_quads_and_tris.blend = cf7c304ccf56ba1bb103070e9b4b4593 +mixed_quads_and_tris.blend = 7b55fe1fdabaf420299b1ed75d6e5679 lamp_modes_example.py.blend = 38abb432cb47f2e08072664bc4507139 MeshPrimitives_example.py.blend_start = 75dd4cc5fcb018077febc70b0c329cc2 -effect_example.py.blend_start = 21234e9ee1c3f4dc165ea501d9f2f9d7 -NMesh_example.py.blend_start = a948c91b9df848f8075da24a07ddcc24 +effect_example.py.blend_start = 8b9a954f9136259f8531b45644629eb4 +NMesh_example.py.blend_start = 28420b68a263d71a4bb4fe880e0918c8 Armature_example2.py.blend_end = 9de007b901061739811b635d8458b6df Window_example1.py.blend = a948c91b9df848f8075da24a07ddcc24 Text3d_example.py.blend = dba4317142a24193be16c95f438bfe6b -NMesh_example.py.blend_end = 3a56be4989138768e2294fabbbdf089e @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs