Revision: 30001
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30001
Author: leifandersen
Date: 2010-07-05 21:23:09 +0200 (Mon, 05 Jul 2010)
Log Message:
-----------
1. Improved implementation in CMake, the Image diff tests are run symply by
running CTest. However, by default, there is no fedback, and the test can take
a long while to run.
Modified Paths:
--------------
branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
branches/soc-2010-leifandersen/tests/CMakeLists.txt
branches/soc-2010-leifandersen/tests/render/run.py
Modified: branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
2010-07-05 18:45:36 UTC (rev 30000)
+++ branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
2010-07-05 19:23:09 UTC (rev 30001)
@@ -175,8 +175,7 @@
IF(WITH_TESTS)
ADD_CUSTOM_COMMAND(TARGET blender POST_BUILD
MAIN_DEPENDANCY blender
COMMENT "copying blender tests..."
- COMMAND cp -R
${Blender_SOURCE_DIR}/tests/pyunit ${Blender_BINARY_DIR}/tests
- COMMAND rm -rf
${Blender_BINARY_DIR}/tests/pyunit/.svn
${Blender_BINARY_DIR}/tests/pyunit/*/.svn
${Blender_BINARY_DIR}/tests/pyunit/*/*/.svn
+ COMMAND rsync --exclude .svn -r
${Blender_SOURCE_DIR}/tests/* ${Blender_BINARY_DIR}/tests
)
ENDIF(WITH_TESTS)
@@ -252,8 +251,7 @@
IF(WITH_TESTS)
ADD_CUSTOM_COMMAND(TARGET blender POST_BUILD
MAIN_DEPENDANCY blender
COMMENT "copying blender tests..."
- COMMAND cp -R
${Blender_SOURCE_DIR}/tests/pyunit ${Blender_BINARY_DIR}/tests
- COMMAND rm -rf
${Blender_BINARY_DIR}/tests/pyunit/.svn
${Blender_BINARY_DIR}/tests/pyunit/*/.svn
${Blender_BINARY_DIR}/tests/pyunit/*/*/.svn
+ COMMAND rsync --exclude .svn -r
${Blender_SOURCE_DIR}/tests/* ${Blender_BINARY_DIR}/tests
)
ENDIF(WITH_TESTS)
@@ -352,7 +350,7 @@
IF(WITH_TESTS)
ADD_CUSTOM_COMMAND(TARGET blender POST_BUILD
MAIN_DEPENDANCY blender
COMMENT "copying blender tests..."
- COMMAND xcopy /E /Y
\"${Blender_SOURCE_DIR}\tests\pyunit\" \"${Blender_BINARY_DIR}\tests\"
+ COMMAND xcopy /E /Y
\"${Blender_SOURCE_DIR}\tests\" \"${Blender_BINARY_DIR}\"
)
ENDIF(WITH_TESTS)
Modified: branches/soc-2010-leifandersen/tests/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-07-05 18:45:36 UTC
(rev 30000)
+++ branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-07-05 19:23:09 UTC
(rev 30001)
@@ -27,4 +27,5 @@
ADD_SUBDIRECTORY(gtest)
ADD_SUBDIRECTORY(pyunit)
-ADD_TEST(python ${Blender_SOURCE_DIR}/tests/render/run.py)
+ADD_TEST(Image_Diffs python ${Blender_BINARY_DIR}/tests/render/run.py)
+SET_TESTS_PROPERTIES(Image_Diffs PROPERTIES PASS_REGULAR_EXPRESSION "All tests
passed")
Modified: branches/soc-2010-leifandersen/tests/render/run.py
===================================================================
--- branches/soc-2010-leifandersen/tests/render/run.py 2010-07-05 18:45:36 UTC
(rev 30000)
+++ branches/soc-2010-leifandersen/tests/render/run.py 2010-07-05 19:23:09 UTC
(rev 30001)
@@ -7,9 +7,9 @@
import string
# My blender path, TODO remove:
-# BLENDER_BIN = "/home/leif/blender-svn/blender-build/bin/blender"
+BLENDER_BIN = "/home/leif/blender-svn/blender-build/bin/blender"
-BLENDER_BIN = "blender"
+# BLENDER_BIN = "blender"
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
