[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30002] branches/soc-2010-leifandersen/ tests: 1.
Leif Andersen
leif.a.andersen at gmail.com
Mon Jul 5 21:53:08 CEST 2010
Revision: 30002
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30002
Author: leifandersen
Date: 2010-07-05 21:53:08 +0200 (Mon, 05 Jul 2010)
Log Message:
-----------
1. Added a flag you can use in run.py --blender-bin, that way you can set the blender binary while running the script.
2. Implemented the flag in CMake
Modified Paths:
--------------
branches/soc-2010-leifandersen/tests/CMakeLists.txt
branches/soc-2010-leifandersen/tests/render/run.py
Modified: branches/soc-2010-leifandersen/tests/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-07-05 19:23:09 UTC (rev 30001)
+++ branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-07-05 19:53:08 UTC (rev 30002)
@@ -27,5 +27,5 @@
ADD_SUBDIRECTORY(gtest)
ADD_SUBDIRECTORY(pyunit)
-ADD_TEST(Image_Diffs python ${Blender_BINARY_DIR}/tests/render/run.py)
+ADD_TEST(Image_Diffs python ${Blender_BINARY_DIR}/tests/render/run.py --blender-bin ${blender_BIINARY_DIR}/bib/blender)
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 19:23:09 UTC (rev 30001)
+++ branches/soc-2010-leifandersen/tests/render/run.py 2010-07-05 19:53:08 UTC (rev 30002)
@@ -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"
@@ -190,6 +190,10 @@
if __name__ == "__main__":
+ if len(sys.argv) > 2:
+ if sys.argv[1] == '--blender-bin':
+ BLENDER_BIN = sys.argv[2]
+
cases = get_cases(sys.path[0])
cases.sort(key=lambda case: case.name)
for test_case in cases:
More information about the Bf-blender-cvs
mailing list