Revision: 31093
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31093
Author: leifandersen
Date: 2010-08-06 06:30:19 +0200 (Fri, 06 Aug 2010)
Log Message:
-----------
1. Added a few more remaining files (I'll probably spend an hour or two
(tomorrow) adding three more, and call it good)
2. Put the hashfile in a single hashfile.txt file in the bin directory (on
build), still not a true hashtable...but it's closer.
3. Integrated into CMake
4. With today's change to the hash operator, some of the older tests have
broken...will fix (although I want to make better tools first).
Modified Paths:
--------------
branches/soc-2010-leifandersen/release/scripts/op/tests_hash.py
branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
branches/soc-2010-leifandersen/tests/CMakeLists.txt
branches/soc-2010-leifandersen/tests/hashfile.txt
branches/soc-2010-leifandersen/tests/physics/CMakeLists.txt
branches/soc-2010-leifandersen/tests/python/Armature_example2.py
branches/soc-2010-leifandersen/tests/python/BGL_example.py
branches/soc-2010-leifandersen/tests/python/Camera_example.py
branches/soc-2010-leifandersen/tests/python/Constraint_example1.py
branches/soc-2010-leifandersen/tests/python/Constraint_example2.py
branches/soc-2010-leifandersen/tests/python/Draw_example.py
branches/soc-2010-leifandersen/tests/python/Font_example.py
branches/soc-2010-leifandersen/tests/python/Group_example2.py
branches/soc-2010-leifandersen/tests/python/MeshPrimitives_example.py
branches/soc-2010-leifandersen/tests/python/Mesh_example.py
branches/soc-2010-leifandersen/tests/python/MetaBall_example.py
branches/soc-2010-leifandersen/tests/python/Modifier_example.py
branches/soc-2010-leifandersen/tests/python/NMesh_example.py
branches/soc-2010-leifandersen/tests/python/Object_example.py
branches/soc-2010-leifandersen/tests/python/Radio_example.py
branches/soc-2010-leifandersen/tests/python/Render_example.py
branches/soc-2010-leifandersen/tests/python/Render_example.py.blend
branches/soc-2010-leifandersen/tests/python/Scene_example.py
branches/soc-2010-leifandersen/tests/python/Scene_example.py.blend
branches/soc-2010-leifandersen/tests/python/Sound_example.py
branches/soc-2010-leifandersen/tests/python/Text3d_example.py
branches/soc-2010-leifandersen/tests/python/Text_example.py
branches/soc-2010-leifandersen/tests/python/Timeline.py
branches/soc-2010-leifandersen/tests/python/Types_example.py
branches/soc-2010-leifandersen/tests/python/Window_example1.py
branches/soc-2010-leifandersen/tests/python/World_example1.py
branches/soc-2010-leifandersen/tests/python/World_example2.py
branches/soc-2010-leifandersen/tests/python/effect_example.py
branches/soc-2010-leifandersen/tests/python/hashfile.txt
branches/soc-2010-leifandersen/tests/python/image_example.py
branches/soc-2010-leifandersen/tests/python/lamp_modes_example.py
Added Paths:
-----------
branches/soc-2010-leifandersen/tests/python/CMakeLists.txt
Modified: branches/soc-2010-leifandersen/release/scripts/op/tests_hash.py
===================================================================
--- branches/soc-2010-leifandersen/release/scripts/op/tests_hash.py
2010-08-06 04:16:13 UTC (rev 31092)
+++ branches/soc-2010-leifandersen/release/scripts/op/tests_hash.py
2010-08-06 04:30:19 UTC (rev 31093)
@@ -48,7 +48,6 @@
for mod in ob.modifiers:
hashcode += hash(mod.type)
hashcode += hash(mod.name)
- hashcode += hash(mod.levels)
if ob.soft_body != None:
sb = ob.soft_body
hashcode += hash(sb.speed)
Modified: branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
2010-08-06 04:16:13 UTC (rev 31092)
+++ branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
2010-08-06 04:30:19 UTC (rev 31093)
@@ -178,6 +178,7 @@
COMMAND rsync --exclude .svn -r
${Blender_SOURCE_DIR}/tests/* ${Blender_BINARY_DIR}/tests
COMMAND cp
${Blender_SOURCE_DIR}/tests/render/run.py
${Blender_BINARY_DIR}/bin/imagediff.py
COMMAND cp
${Blender_SOURCE_DIR}/tests/hash_compare.py
${Blender_BINARY_DIR}/bin/hash_compare.py
+ COMMAND cp
${Blender_SOURCE_DIR}/tests/hashfile.txt ${Blender_BINARY_DIR}/bin/hashfile.txt
)
ENDIF(WITH_TESTS)
Modified: branches/soc-2010-leifandersen/tests/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-08-06 04:16:13 UTC
(rev 31092)
+++ branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-08-06 04:30:19 UTC
(rev 31093)
@@ -27,6 +27,7 @@
ADD_SUBDIRECTORY(data)
ADD_SUBDIRECTORY(export_import_testing)
ADD_SUBDIRECTORY(physics)
+ADD_SUBDIRECTORY(python)
ADD_TEST(Image_Diffs python ${Blender_BINARY_DIR}/tests/render/run.py
--blender-bin ${Blender_BINARY_DIR}/bin/blender)
SET_TESTS_PROPERTIES(Image_Diffs PROPERTIES PASS_REGULAR_EXPRESSION "All tests
passed")
Modified: branches/soc-2010-leifandersen/tests/hashfile.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/hashfile.txt 2010-08-06 04:16:13 UTC
(rev 31092)
+++ branches/soc-2010-leifandersen/tests/hashfile.txt 2010-08-06 04:30:19 UTC
(rev 31093)
@@ -0,0 +1,47 @@
+# Physics
+boids.blend = 3658705244932225025
+continue_physics.blend = 29552361635886812012
+fluidsim.blend = 6272360887841423892
+fountain.blend = 12235246013706623080
+particle_children_hair.blend = 15571841953816041222
+particle_extras_effector.blend = 29821303617275196601
+radioroom.blend = 165466738618733210673
+softbody_basics.blend = -9867193991627132880
+softbodytest.blend = 27517989050919739075
+softhairtest.blend = -12101118624995636669
+
+# Python
+Armature_example2.py.blend_start = -364238819647067223878
+Armature_example2.py.blend_end = -344900587044515783735
+Camera_example.py.blend_start = -14300758262507746666
+Camera_example.py.blend_end = -31619213351238176625
+Constraint_example1.py.blend_start = -2034449402296039890
+Constraint_example1.py.blend_end = -2034449400852879826
+Constraint_example2.py.blend_start = -207409205650300112139
+Constraint_example2.py.blend_end = -207409205650300112138
+effect_example.py.blend_start = -15342881782350963335
+effect_example.py.blend_end = -15342881782350962885
+Font_example.py.blend_start = -22262356698404542388
+Font_example.py.blend_end = -60195516037617288890
+Group_example2.py.blend_start = -2748352640926596867
+Group_example2.py.blend_end = -7145151643561397340
+image_example.py.blend_start = -14300758262507746666
+image_example.py.blend_end = -5745724874654974270
+lamp_modes_example.py.blend_start = -15330808205140559615
+lamp_modes_example.py.blend_end = -29347588579616917852
+Mesh_example.py.blend_start = -22262356698404542388
+Mesh_example.py.blend_end = -20878286593088736557
+MeshPrimitives_example.py.blend_start = -22262356698404542388
+MeshPrimitives_example.py.blend_end = -14300758262507746663
+MetaBall_example.py.blend_start = -22262356698404542388
+MetaBall_example.py.blend_end = -16465600348693923713
+Modifier_example.py.blend_start = -14300758262507746666
+Modifier_example.py.blend_end = -14765986523746378294
+NMesh_example.py.blend_start = -14300758262507746666
+NMesh_example.py.blend_end = -14300758261913453413
+Object_example.py.blend_start = -14300758262507746666
+Object_example.py.blend_end = -23496178611252018289
+Render_example.py.blend_start = -14300758262507746666
+Render_example.py.blend_end = -14300758262507746666
+Scene_example.py.blend_start = -14300758262507746666
+Scene_example.py.blend_end = -20538575849302840700
\ No newline at end of file
Modified: branches/soc-2010-leifandersen/tests/physics/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/physics/CMakeLists.txt 2010-08-06
04:16:13 UTC (rev 31092)
+++ branches/soc-2010-leifandersen/tests/physics/CMakeLists.txt 2010-08-06
04:30:19 UTC (rev 31093)
@@ -72,4 +72,4 @@
${Blender_BINARY_DIR}/tests/physics/softhairtest.blend
-P ${Blender_BINARY_DIR}/bin/hash_compare.py
)
-SET_TESTS_PROPERTIES(PH_Softhairtest PROPERTIES PASS_REGULAR_EXPRESSION
"OK")
+SET_TESTS_PROPERTIES(PH_Softhairtest PROPERTIES PASS_REGULAR_EXPRESSION "OK")
Modified: branches/soc-2010-leifandersen/tests/python/Armature_example2.py
===================================================================
--- branches/soc-2010-leifandersen/tests/python/Armature_example2.py
2010-08-06 04:16:13 UTC (rev 31092)
+++ branches/soc-2010-leifandersen/tests/python/Armature_example2.py
2010-08-06 04:30:19 UTC (rev 31093)
@@ -61,7 +61,7 @@
])
if __name__ == "__main__":
- print(bpy.ops.tests.read_hashfile(filepath="hashfile.txt"))
+
print(bpy.ops.tests.read_hashfile(filepath=os.path.join(os.path.split(sys.argv[0])[0],
'hashfile.txt')))
data = tests.hashfile.data
unittest.TextTestRunner(verbosity=2).run(suite())
- bpy.ops.wm.exit_blender()
\ No newline at end of file
+ bpy.ops.wm.exit_blender()
Modified: branches/soc-2010-leifandersen/tests/python/BGL_example.py
===================================================================
--- branches/soc-2010-leifandersen/tests/python/BGL_example.py 2010-08-06
04:16:13 UTC (rev 31092)
+++ branches/soc-2010-leifandersen/tests/python/BGL_example.py 2010-08-06
04:30:19 UTC (rev 31093)
@@ -34,7 +34,7 @@
])
if __name__ == "__main__":
- print(bpy.ops.tests.read_hashfile(filepath="hashfile.txt"))
+
print(bpy.ops.tests.read_hashfile(filepath=os.path.join(os.path.split(sys.argv[0])[0],
'hashfile.txt')))
data = tests.hashfile.data
unittest.TextTestRunner(verbosity=2).run(suite())
- bpy.ops.wm.exit_blender()
\ No newline at end of file
+ bpy.ops.wm.exit_blender()
Added: branches/soc-2010-leifandersen/tests/python/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/python/CMakeLists.txt
(rev 0)
+++ branches/soc-2010-leifandersen/tests/python/CMakeLists.txt 2010-08-06
04:30:19 UTC (rev 31093)
@@ -0,0 +1,119 @@
+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/Armature_example2.py
+)
+SET_TESTS_PROPERTIES(PY_Armature_Example2 PROPERTIES PASS_REGULAR_EXPRESSION
"OK")
+
+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/Camera_example.py
+)
+SET_TESTS_PROPERTIES(PY_Camera_Example PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+
+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/Armature_example2.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/Constraint_example1.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/Constraint_example2.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/effect_example.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/Font_example.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
+ -P ${Blender_BINARY_DIR}/tests/python/effect_example.py
+)
+SET_TESTS_PROPERTIES(PY_Effect_Example PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+
+ADD_TEST(PY_Group_Example2 ${Blender_BINARY_DIR}/bin/blender
+ ${Blender_BINARY_DIR}/tests/python/Group_example2.py.blend
+ -P ${Blender_BINARY_DIR}/tests/python/Group_example2.py
+)
+SET_TESTS_PROPERTIES(PY_Group_Example2 PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+
+ADD_TEST(PY_Image_Example ${Blender_BINARY_DIR}/bin/blender
+ ${Blender_BINARY_DIR}/tests/python/image_example.py.blend
+ -P ${Blender_BINARY_DIR}/tests/python/image_example.py
+)
+SET_TESTS_PROPERTIES(PY_Image_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
+ -P ${Blender_BINARY_DIR}/tests/python/effect_example.py
+)
+SET_TESTS_PROPERTIES(PY_Effect_Example PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+
+ADD_TEST(PY_Lamp_Modes_Example ${Blender_BINARY_DIR}/bin/blender
+ ${Blender_BINARY_DIR}/tests/python/lamp_modes_example.py.blend
@@ 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
