[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31184] branches/soc-2010-leifandersen/ tests: 1.
Leif Andersen
leif.a.andersen at gmail.com
Mon Aug 9 03:49:11 CEST 2010
Revision: 31184
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31184
Author: leifandersen
Date: 2010-08-09 03:49:10 +0200 (Mon, 09 Aug 2010)
Log Message:
-----------
1. Changed the CTest script to run on every file in the folder.
2. Added a 'addon' folder, for devs to add their own tests in python (without having to deal with the framework at all).
Modified Paths:
--------------
branches/soc-2010-leifandersen/tests/CMakeLists.txt
branches/soc-2010-leifandersen/tests/data/data/CMakeLists.txt
branches/soc-2010-leifandersen/tests/data/ops/physics/CMakeLists.txt
branches/soc-2010-leifandersen/tests/data/ops/wm/CMakeLists.txt
branches/soc-2010-leifandersen/tests/export_import_testing/CMakeLists.txt
branches/soc-2010-leifandersen/tests/python/CMakeLists.txt
Added Paths:
-----------
branches/soc-2010-leifandersen/tests/addon/
branches/soc-2010-leifandersen/tests/addon/CMakeLists.txt
branches/soc-2010-leifandersen/tests/addon/demo.py
Removed Paths:
-------------
branches/soc-2010-leifandersen/tests/python/script.py
Modified: branches/soc-2010-leifandersen/tests/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-08-09 01:37:09 UTC (rev 31183)
+++ branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-08-09 01:49:10 UTC (rev 31184)
@@ -29,3 +29,4 @@
ADD_SUBDIRECTORY(physics)
ADD_SUBDIRECTORY(python)
ADD_SUBDIRECTORY(render)
+ADD_SUBDIRECtoRY(addon)
Added: branches/soc-2010-leifandersen/tests/addon/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/addon/CMakeLists.txt (rev 0)
+++ branches/soc-2010-leifandersen/tests/addon/CMakeLists.txt 2010-08-09 01:49:10 UTC (rev 31184)
@@ -0,0 +1,11 @@
+FILE(GLOB SRC *.py)
+
+FOREACH(NAME ${SRC})
+ ADD_TEST(AO_${NAME} ${Blender_BINARY_DIR}/bin/blender
+ -P ${NAME}
+ )
+ SET_TESTS_PROPERTIES(AO_${NAME} PROPERTIES
+ PASS_REGULAR_EXPRESSION "OK"
+ TIMEOUT 30
+ )
+ENDFOREACH(NAME)
Added: branches/soc-2010-leifandersen/tests/addon/demo.py
===================================================================
--- branches/soc-2010-leifandersen/tests/addon/demo.py (rev 0)
+++ branches/soc-2010-leifandersen/tests/addon/demo.py 2010-08-09 01:49:10 UTC (rev 31184)
@@ -0,0 +1,23 @@
+import bpy
+import tests
+
+import unittest
+import sys
+import os
+
+class TestCurrentFile(unittest.TestCase):
+
+ def setUp(self):
+ pass
+
+ def test_case(self):
+ self.assertEquals(0,0)
+
+def suite():
+ return unittest.TestSuite([
+unittest.TestLoader().loadTestsFromTestCase(TestCurrentFile),
+])
+
+if __name__ == "__main__":
+ unittest.TextTestRunner(verbosity=2).run(suite())
+ bpy.ops.wm.exit_blender()
Modified: branches/soc-2010-leifandersen/tests/data/data/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/data/data/CMakeLists.txt 2010-08-09 01:37:09 UTC (rev 31183)
+++ branches/soc-2010-leifandersen/tests/data/data/CMakeLists.txt 2010-08-09 01:49:10 UTC (rev 31184)
@@ -1,11 +1,10 @@
-ADD_TEST(Data_Mesh_Test ${Blender_BINARY_DIR}/bin/blender -b -P ${Blender_BINARY_DIR}/tests/pyunit/data/meshes.py)
-SET_TESTS_PROPERTIES(Data_Mesh_Test PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+FILE(GLOB SRC *.py)
-ADD_TEST(Data_Scene_Test ${Blender_BINARY_DIR}/bin/blender -b -P ${Blender_BINARY_DIR}/tests/pyunit/data/scenes.py)
-SET_TESTS_PROPERTIES(Data_Scene_Test PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(Data_Lamp_Test ${Blender_BINARY_DIR}/bin/blender -b -P ${Blender_BINARY_DIR}/tests/pyunit/data/lamps.py)
-SET_TESTS_PROPERTIES(Data_Lamp_Test PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(Data_Object_Test ${Blender_BINARY_DIR}/bin/blender -b -P ${Blender_BINARY_DIR}/tests/pyunit/data/objects.py)
-SET_TESTS_PROPERTIES(Data_Object_Test PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+FOREACH(NAME ${SRC})
+ ADD_TEST(DA_${NAME} ${Blender_BINARY_DIR}/bin/blender -P ${NAME}
+ )
+ SET_TESTS_PROPERTIES(DA_${NAME} PROPERTIES
+ PASS_REGULAR_EXPRESSION "OK"
+ TIMEOUT 10
+ )
+ENDFOREACH(NAME)
Modified: branches/soc-2010-leifandersen/tests/data/ops/physics/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/data/ops/physics/CMakeLists.txt 2010-08-09 01:37:09 UTC (rev 31183)
+++ branches/soc-2010-leifandersen/tests/data/ops/physics/CMakeLists.txt 2010-08-09 01:49:10 UTC (rev 31184)
@@ -1,11 +1,11 @@
ADD_TEST(Ops_Particle_Test ${Blender_BINARY_DIR}/bin/blender -P ${Blender_BINARY_DIR}/tests/pyunit/ops/physics/particle.py)
-
-SET_TESTS_PROPERTIES(Ops_Particle_Test
- PROPERTIES PASS_REGULAR_EXPRESSION "OK"
+SET_TESTS_PROPERTIES(Ops_Particle_Test PROPERTIES
+ PASS_REGULAR_EXPRESSION "OK"
+ TIMEOUT 10
)
ADD_TEST(Ops_Particle_Test_Image_Compare python ${Blender_BINARY_DIR}/tests/render/run.py --blender-bin ${Blender_BINARY_DIR}/bin/blender --image ${Blender_BINARY_DIR}/tests/pyunit/ops/physics/cube_hair.blend ${Blender_BINARY_DIR}/tests/pyunit/ops/physics/cube_hair_group.blend ${Blender_BINARY_DIR}/tests/pyunit/ops/physics/cube_hair_object.blend)
-
-SET_TESTS_PROPERTIES(Ops_Particle_Test_Image_Compare
- PROPERTIES PASS_REGULAR_EXPRESSION "All tests passed"
+SET_TESTS_PROPERTIES(Ops_Particle_Test_Image_Compare PROPERTIES
+ PASS_REGULAR_EXPRESSION "OK"
+ TIMEOUT 10
)
Modified: branches/soc-2010-leifandersen/tests/data/ops/wm/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/data/ops/wm/CMakeLists.txt 2010-08-09 01:37:09 UTC (rev 31183)
+++ branches/soc-2010-leifandersen/tests/data/ops/wm/CMakeLists.txt 2010-08-09 01:49:10 UTC (rev 31184)
@@ -1,2 +1,5 @@
-#ADD_TEST(Ops_Setup_Test ${Blender_BINARY_DIR}/bin/blender -P ${Blender_BINARY_DIR}/tests/pyunit/ops/wm/setup.py)
-#SET_TESTS_PROPERTIES(Ops_Setup_Test PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+ADD_TEST(Ops_Setup_Test ${Blender_BINARY_DIR}/bin/blender -P ${Blender_BINARY_DIR}/tests/pyunit/ops/wm/setup.py)
+SET_TESTS_PROPERTIES(Ops_Setup_Test PROPERTIES
+ PASS_REGULAR_EXPRESSION "OK"
+ TIMEOUT 10
+)
Modified: branches/soc-2010-leifandersen/tests/export_import_testing/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/export_import_testing/CMakeLists.txt 2010-08-09 01:37:09 UTC (rev 31183)
+++ branches/soc-2010-leifandersen/tests/export_import_testing/CMakeLists.txt 2010-08-09 01:49:10 UTC (rev 31184)
@@ -1,42 +1,11 @@
-ADD_TEST(EI_All_Quads ${Blender_BINARY_DIR}/bin/blender
- -b ${Blender_BINARY_DIR}/tests/export_import_testing/MESH_GEOMETRY/all_quads.blend
- -P ${Blender_BINARY_DIR}/bin/hash_compare.py
-)
-SET_TESTS_PROPERTIES(EI_All_Quads PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+FILE(GLOB SRC */*.blend)
-ADD_TEST(EI_All_Tris ${Blender_BINARY_DIR}/bin/blender
- -b ${Blender_BINARY_DIR}/tests/export_import_testing/MESH_GEOMETRY/all_tris.blend
- -P ${Blender_BINARY_DIR}/bin/hash_compare.py
-)
-SET_TESTS_PROPERTIES(EI_All_Tris PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(EI_Edges ${Blender_BINARY_DIR}/bin/blender
- -b ${Blender_BINARY_DIR}/tests/export_import_testing/MESH_GEOMETRY/edges.blend
- -P ${Blender_BINARY_DIR}/bin/hash_compare.py
-)
-SET_TESTS_PROPERTIES(EI_Edges PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(EI_Fgons ${Blender_BINARY_DIR}/bin/blender
- -b ${Blender_BINARY_DIR}/tests/export_import_testing/MESH_GEOMETRY/fgons.blend
- -P ${Blender_BINARY_DIR}/bin/hash_compare.py
-)
-SET_TESTS_PROPERTIES(EI_Fgons PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(EI_Mixed_Quads_And_Tris ${Blender_BINARY_DIR}/bin/blender
- -b ${Blender_BINARY_DIR}/tests/export_import_testing/MESH_GEOMETRY/mixed_quads_and_tris.blend
- -P ${Blender_BINARY_DIR}/bin/hash_compare.py
-)
-SET_TESTS_PROPERTIES(EI_Mixed_Quads_And_Tris PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(EI_Nurbs ${Blender_BINARY_DIR}/bin/blender
- -b ${Blender_BINARY_DIR}/tests/export_import_testing/MESH_GEOMETRY/NURBS.blend
- -P ${Blender_BINARY_DIR}/bin/hash_compare.py
-)
-SET_TESTS_PROPERTIES(EI_Nurbs PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(EI_Vertices ${Blender_BINARY_DIR}/bin/blender
- -b ${Blender_BINARY_DIR}/tests/export_import_testing/MESH_GEOMETRY/vertices.blend
- -P ${Blender_BINARY_DIR}/bin/hash_compare.py
-)
-SET_TESTS_PROPERTIES(EI_Vertices PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
+FOREACH(NAME ${SRC})
+ ADD_TEST(EI_${NAME} ${Blender_BINARY_DIR}/bin/blender ${NAME}
+ -P ${Blender_BINARY_DIR}/bin/hash_compare.py
+ )
+ SET_TESTS_PROPERTIES(EI_${NAME} PROPERTIES
+ PASS_REGULAR_EXPRESSION "OK"
+ TIMEOUT 10
+ )
+ENDFOREACH(NAME)
Modified: branches/soc-2010-leifandersen/tests/python/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/python/CMakeLists.txt 2010-08-09 01:37:09 UTC (rev 31183)
+++ branches/soc-2010-leifandersen/tests/python/CMakeLists.txt 2010-08-09 01:49:10 UTC (rev 31184)
@@ -1,167 +1,20 @@
-ADD_TEST(PY_Armature_Example2 ${Blender_BINARY_DIR}/bin/blender
- ${Blender_BINARY_DIR}/tests/python/Armature_example2.py.blend
- -P ${Blender_BINARY_DIR}/tests/python/hash_compare.py
-)
-SET_TESTS_PROPERTIES(PY_Armature_Example2 PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+FILE(GLOB SRC *.py)
-ADD_TEST(PY_Camera_Example ${Blender_BINARY_DIR}/bin/blender
- ${Blender_BINARY_DIR}/tests/python/Camera_example.py.blend
- -P ${Blender_BINARY_DIR}/tests/python/hash_compare.py
-)
-SET_TESTS_PROPERTIES(PY_Camera_Example PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+FOREACH(NAME ${SRC})
+ ADD_TEST(PY_${NAME} ${Blender_BINARY_DIR}/bin/blender ${NAME}.blend
+ -P ${Blender_BINARY_DIR}/tests/python/hash_compare.py
+ )
+ SET_TESTS_PROPERTIES(PY_${NAME} PROPERTIES
+ PASS_REGULAR_EXPRESSION "OK"
+ TIMEOUT 10
+ )
+ENDFOREACH(NAME)
-ADD_TEST(PY_Armature_Example2 ${Blender_BINARY_DIR}/bin/blender
- ${Blender_BINARY_DIR}/tests/python/Armature_example2.py.blend
- -P ${Blender_BINARY_DIR}/tests/python/hash_compare.py
-)
-SET_TESTS_PROPERTIES(PY_Armature_Example2 PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-ADD_TEST(PY_Constraint_Example1 ${Blender_BINARY_DIR}/bin/blender
- ${Blender_BINARY_DIR}/tests/python/Constraint_example1.py.blend
- -P ${Blender_BINARY_DIR}/tests/python/hash_compare.py
-)
-SET_TESTS_PROPERTIES(PY_Constraint_Example1 PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(PY_Constraint_Example2 ${Blender_BINARY_DIR}/bin/blender
- ${Blender_BINARY_DIR}/tests/python/Constraint_example2.py.blend
- -P ${Blender_BINARY_DIR}/tests/python/hash_compare.py
-)
-SET_TESTS_PROPERTIES(PY_Constraint_Example2 PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(PY_Effect_Example ${Blender_BINARY_DIR}/bin/blender
- ${Blender_BINARY_DIR}/tests/python/effect_example.py.blend
- -P ${Blender_BINARY_DIR}/tests/python/hash_compare.py
-)
-SET_TESTS_PROPERTIES(PY_Effect_Example PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(PY_Font_Example ${Blender_BINARY_DIR}/bin/blender
- ${Blender_BINARY_DIR}/tests/python/Font_example.py.blend
- -P ${Blender_BINARY_DIR}/tests/python/hash_compare.py
-)
-SET_TESTS_PROPERTIES(PY_Font_Example PROPERTIES PASS_REGULAR_EXPRESSION "OK")
-
-ADD_TEST(PY_Effect_Example ${Blender_BINARY_DIR}/bin/blender
- ${Blender_BINARY_DIR}/tests/python/effect_example.py.blend
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list