Revision: 31271
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31271
Author: leifandersen
Date: 2010-08-12 03:05:11 +0200 (Thu, 12 Aug 2010)
Log Message:
-----------
1. Changed CTest to run all of the render tests as individual tests. It leads
to a lot more failures, but makes it easier to see what's wrong. (Done via a
loop).
2. Changed the addon folder to shorten the name.
Hopefully, if all goes well, this should be the last change to the code
(besides cleanup/documentation).
Modified Paths:
--------------
branches/soc-2010-leifandersen/tests/addon/CMakeLists.txt
branches/soc-2010-leifandersen/tests/render/CMakeLists.txt
Modified: branches/soc-2010-leifandersen/tests/addon/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/addon/CMakeLists.txt 2010-08-12
00:14:32 UTC (rev 31270)
+++ branches/soc-2010-leifandersen/tests/addon/CMakeLists.txt 2010-08-12
01:05:11 UTC (rev 31271)
@@ -1,6 +1,9 @@
FILE(GLOB SRC *.py)
-FOREACH(NAME ${SRC})
+STRING(REGEX REPLACE ${Blender_SOURCE_DIR} ";${Blender_BINARY_DIR}" BIN
${SRC})
+
+FOREACH(PATH ${BIN})
+ STRING(REGEX REPLACE "${Blender_BINARY_DIR}/tests/addon/" "" NAME
${PATH})
ADD_TEST(AO_${NAME} ${Blender_BINARY_DIR}/bin/blender
-P ${NAME}
)
@@ -8,4 +11,4 @@
PASS_REGULAR_EXPRESSION "OK"
TIMEOUT 30
)
-ENDFOREACH(NAME)
+ENDFOREACH(PATH)
Modified: branches/soc-2010-leifandersen/tests/render/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/render/CMakeLists.txt 2010-08-12
00:14:32 UTC (rev 31270)
+++ branches/soc-2010-leifandersen/tests/render/CMakeLists.txt 2010-08-12
01:05:11 UTC (rev 31271)
@@ -1,45 +1,38 @@
-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")
+FILE(GLOB SRC *.blend)
-ADD_TEST(Image_Diffs_Large python ${Blender_BINARY_DIR}/tests/render/run.py
+STRING(REGEX REPLACE ${Blender_SOURCE_DIR} ";${Blender_BINARY_DIR}" BIN
${SRC})
+
+FOREACH(PATH ${BIN})
+ STRING(REGEX REPLACE "${Blender_BINARY_DIR}/tests/render/" "" NAME
${PATH})
+ ADD_TEST(RE_${NAME} python ${Blender_BINARY_DIR}/tests/render/run.py
+ --blender-bin ${Blender_BINARY_DIR}/bin/blender
+ -i ${PATH}
+ )
+ SET_TESTS_PROPERTIES(RE_${NAME} PROPERTIES
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ TIMEOUT 300
+ )
+ENDFOREACH(PATH)
+
+ADD_TEST(RE_Sky-Atmosphere.blend python
${Blender_BINARY_DIR}/tests/render/run.py
--blender-bin ${Blender_BINARY_DIR}/bin/blender
-i ${Blender_BINARY_DIR}/tests/render/large/Sky-Atmosphere.blend
)
-SET_TESTS_PROPERTIES(Image_Diffs_Large PROPERTIES PASS_REGULAR_EXPRESSION "All
tests passed")
+SET_TESTS_PROPERTIES(RE_Sky-Atmosphere.blend PROPERTIES
PASS_REGULAR_EXPRESSION "All tests passed")
-ADD_TEST(Animation_Diffs python ${Blender_BINARY_DIR}/tests/render/run.py
- --blender-bin ${Blender_BINARY_DIR}/bin/blender
- -a ${Blender_BINARY_DIR}/tests/render/anim/camera.blend
- ${Blender_BINARY_DIR}/tests/render/anim/cubesphere.blend
- ${Blender_BINARY_DIR}/tests/render/anim/deformtest.blend
- ${Blender_BINARY_DIR}/tests/render/anim/dolphin.blend
- ${Blender_BINARY_DIR}/tests/render/anim/driver-object-eyes.blend
- ${Blender_BINARY_DIR}/tests/render/anim/expload_modifier.blend
- ${Blender_BINARY_DIR}/tests/render/anim/glass.blend
- ${Blender_BINARY_DIR}/tests/render/anim/grass_wind.blend
- ${Blender_BINARY_DIR}/tests/render/anim/group-duplicate.blend
- ${Blender_BINARY_DIR}/tests/render/anim/hairball.blend
- ${Blender_BINARY_DIR}/tests/render/anim/hairguide.blend
- ${Blender_BINARY_DIR}/tests/render/anim/icetest.blend
- ${Blender_BINARY_DIR}/tests/render/anim/knight.blend
- ${Blender_BINARY_DIR}/tests/render/anim/lostride.blend
- ${Blender_BINARY_DIR}/tests/render/anim/motionblender.blend
- ${Blender_BINARY_DIR}/tests/render/anim/relative.blend
- ${Blender_BINARY_DIR}/tests/render/anim/sequence.blend
- ${Blender_BINARY_DIR}/tests/render/anim/softbody_curve_lattice.blend
- ${Blender_BINARY_DIR}/tests/render/anim/softhairtest.blend
- ${Blender_BINARY_DIR}/tests/render/anim/timeline.blend
- ${Blender_BINARY_DIR}/tests/render/anim/vectorblur.blend
-)
-SET_TESTS_PROPERTIES(Animation_Diffs PROPERTIES PASS_REGULAR_EXPRESSION "All
tests passed")
+FILE(GLOB SRC_ANIM anim/*.blend)
+STRING(REGEX REPLACE ${Blender_SOURCE_DIR} ";${Blender_BINARY_DIR}" BIN_ANIM
${SRC_ANIM})
-ADD_TEST(Animation_Diffs_Large python ${Blender_BINARY_DIR}/tests/render/run.py
- --blender-bin ${Blender_BINARY_DIR}/bin/blender
- -a ${Blender_BINARY_DIR}/tests/render/anim/array3.blend
- ${Blender_BINARY_DIR}/tests/render/anim/clothtest.blend
- ${Blender_BINARY_DIR}/tests/render/anim/robo_ao.blend
-)
-SET_TESTS_PROPERTIES(Animation_Diffs_Large PROPERTIES PASS_REGULAR_EXPRESSION
"All tests passed")
+FOREACH(PATH ${BIN_ANIM})
+ STRING(REGEX REPLACE "${Blender_BINARY_DIR}/tests/render/anim/" "" NAME
${PATH})
+ ADD_TEST(REA_${NAME} python ${Blender_BINARY_DIR}/tests/render/run.py
+ --blender-bin ${Blender_BINARY_DIR}/bin/blender
+ -a ${PATH}
+ )
+ SET_TESTS_PROPERTIES(REA_${NAME} PROPERTIES
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ TIMEOUT 600
+ )
+ENDFOREACH(PATH)
+
\ No newline at end of file
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
