[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29831] branches/soc-2010-leifandersen: 1.
Leif Andersen
leif.a.andersen at gmail.com
Wed Jun 30 20:14:35 CEST 2010
Revision: 29831
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29831
Author: leifandersen
Date: 2010-06-30 20:14:33 +0200 (Wed, 30 Jun 2010)
Log Message:
-----------
1. Changed the strings so that images aren't stored as filename.blend.png, or filename.blend_0001.png, but filename.png and filename_0001.png. Moved files as well.
2. Changed the BLENDER_BIN to point to blender, thus assuming that it was in the users path. Some more changes will be needed for windows, etc.
3. The system now keeps track of all the files that passed and failed.
4. Improvements to the outputted html webpage:
a. I learned to spell border. ;)
b. It now actually prints OK or FAILED, depending on if it passed or failed. I'm thinking I should also change the color of failed (possibly to red, which implie I change the background to a darker color).
5. Improved the output (a bit), so that you can easiily see the failed tests at the end. (As apposed to readiing everything).
Modified Paths:
--------------
branches/soc-2010-leifandersen/release/scripts/op/tests_render.py
branches/soc-2010-leifandersen/tests/CMakeLists.txt
branches/soc-2010-leifandersen/tests/render/run.py
Added Paths:
-----------
branches/soc-2010-leifandersen/tests/render/render/allselect.png
branches/soc-2010-leifandersen/tests/render/render/arealight.png
branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes.png
branches/soc-2010-leifandersen/tests/render/render/compo_map_uv.png
branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_cubes.png
branches/soc-2010-leifandersen/tests/render/render/compo_map_zcombine_cubes.png
branches/soc-2010-leifandersen/tests/render/render/composite_image.png
branches/soc-2010-leifandersen/tests/render/render/composite_layers.png
branches/soc-2010-leifandersen/tests/render/render/displace.png
Removed Paths:
-------------
branches/soc-2010-leifandersen/tests/render/render/allselect.blend.png
branches/soc-2010-leifandersen/tests/render/render/arealight.blend.png
branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes.blend.png
branches/soc-2010-leifandersen/tests/render/render/compo_map_uv.blend.png
branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_cubes.blend.png
branches/soc-2010-leifandersen/tests/render/render/compo_map_zcombine_cubes.blend.png
branches/soc-2010-leifandersen/tests/render/render/composite_image.blend.png
branches/soc-2010-leifandersen/tests/render/render/composite_layers.blend.png
branches/soc-2010-leifandersen/tests/render/render/displace.blend.png
Modified: branches/soc-2010-leifandersen/release/scripts/op/tests_render.py
===================================================================
--- branches/soc-2010-leifandersen/release/scripts/op/tests_render.py 2010-06-30 17:42:42 UTC (rev 29830)
+++ branches/soc-2010-leifandersen/release/scripts/op/tests_render.py 2010-06-30 18:14:33 UTC (rev 29831)
@@ -65,7 +65,7 @@
def execute(self, context):
(directory, filename) = os.path.split(self.properties.filepath)
for file in os.listdir(directory):
- if file != 'output' and file != 'render' and file != 'anim' and file != PILTEST_PY:
+ if file.find('.blend') != -1:
bpy.ops.tests.render(filepath=self.properties.filepath)
return {'FINISHED'}
Modified: branches/soc-2010-leifandersen/tests/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-06-30 17:42:42 UTC (rev 29830)
+++ branches/soc-2010-leifandersen/tests/CMakeLists.txt 2010-06-30 18:14:33 UTC (rev 29831)
@@ -27,5 +27,4 @@
ADD_SUBDIRECTORY(gtest)
ADD_SUBDIRECTORY(pyunit)
-# A few more modifications needed for this script to work.
-# ADD_TEST(${Blender_BINARY_DIR}/bin/blender -b -P rennderdiff.py)
+ADD_TEST(python ${Blender_SOURCE_DIR}/tests/render/run.py)
Deleted: branches/soc-2010-leifandersen/tests/render/render/allselect.blend.png
===================================================================
(Binary files differ)
Added: branches/soc-2010-leifandersen/tests/render/render/allselect.png
===================================================================
(Binary files differ)
Property changes on: branches/soc-2010-leifandersen/tests/render/render/allselect.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/soc-2010-leifandersen/tests/render/render/arealight.blend.png
===================================================================
(Binary files differ)
Added: branches/soc-2010-leifandersen/tests/render/render/arealight.png
===================================================================
(Binary files differ)
Property changes on: branches/soc-2010-leifandersen/tests/render/render/arealight.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes.blend.png
===================================================================
(Binary files differ)
Added: branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes.png
===================================================================
(Binary files differ)
Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv.blend.png
===================================================================
(Binary files differ)
Added: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv.png
===================================================================
(Binary files differ)
Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_cubes.blend.png
===================================================================
(Binary files differ)
Added: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_cubes.png
===================================================================
(Binary files differ)
Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_cubes.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/soc-2010-leifandersen/tests/render/render/compo_map_zcombine_cubes.blend.png
===================================================================
(Binary files differ)
Added: branches/soc-2010-leifandersen/tests/render/render/compo_map_zcombine_cubes.png
===================================================================
(Binary files differ)
Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_map_zcombine_cubes.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/soc-2010-leifandersen/tests/render/render/composite_image.blend.png
===================================================================
(Binary files differ)
Added: branches/soc-2010-leifandersen/tests/render/render/composite_image.png
===================================================================
(Binary files differ)
Property changes on: branches/soc-2010-leifandersen/tests/render/render/composite_image.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/soc-2010-leifandersen/tests/render/render/composite_layers.blend.png
===================================================================
(Binary files differ)
Added: branches/soc-2010-leifandersen/tests/render/render/composite_layers.png
===================================================================
(Binary files differ)
Property changes on: branches/soc-2010-leifandersen/tests/render/render/composite_layers.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/soc-2010-leifandersen/tests/render/render/displace.blend.png
===================================================================
(Binary files differ)
Added: branches/soc-2010-leifandersen/tests/render/render/displace.png
===================================================================
(Binary files differ)
Property changes on: branches/soc-2010-leifandersen/tests/render/render/displace.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/soc-2010-leifandersen/tests/render/run.py
===================================================================
--- branches/soc-2010-leifandersen/tests/render/run.py 2010-06-30 17:42:42 UTC (rev 29830)
+++ branches/soc-2010-leifandersen/tests/render/run.py 2010-06-30 18:14:33 UTC (rev 29831)
@@ -2,13 +2,17 @@
import unittest
import os
import sys
+import string
-BLENDER_BIN = "/home/leif/blender-svn/blender-build/bin/blender"
+# My blender path, TODO remove:
+# BLENDER_BIN = "/home/leif/blender-svn/blender-build/bin/blender"
+BLENDER_BIN = "blender"
+
def render(filename):
- command = BLENDER_BIN + " -b " + os.path.join(sys.path[0], filename) + " -o " + os.path.join(sys.path[0], "output", (filename + "_####")) + " -F PNG -x 1 -f 1"
+ command = BLENDER_BIN + " -b " + os.path.join(sys.path[0], filename) + " -o " + os.path.join(sys.path[0], "output", (string.replace(filename, '.blend', '') + "_####")) + " -F PNG -x 1 -f 1"
os.system(command)
- return os.path.join(sys.path[0], "output", filename, "_0001.png")
+ return os.path.join(sys.path[0], "output", string.replace(filename, '.blend', '_0001.png'))
class TestImage(unittest.TestCase):
@@ -17,8 +21,8 @@
im2 = None
def setUp(self):
- image_path1 = os.path.join(sys.path[0], 'render', filename + '.png')
- image_path2 = os.path.join(sys.path[0], 'output', filename + '_0001.png')
+ image_path1 = os.path.join(sys.path[0], 'render', string.replace(filename,'.blend', '.png'))
+ image_path2 = os.path.join(sys.path[0], 'output', string.replace(filename, '.blend', '_0001.png'))
self.im1 = Image.open(image_path1)
self.im2 = Image.open(image_path2)
@@ -99,6 +103,8 @@
])
if __name__ == "__main__":
+ passed = []
+ failed = []
if len(sys.argv) > 1 and sys.argv[1] == '--blender-intern':
# If this is run in blender, than the images already exist
# and only comparisons need to take place.
@@ -109,7 +115,7 @@
#Setting up the HTML File
file = open(os.path.join(sys.path[0],"index.html"), "w")
file.write('<html><head><title>Render Test Output</title></head>\n')
- file.write('<body>\n<table boarder="1">\n')
+ file.write('<body>\n<table border="1">\n')
file.write('<tr>\n')
file.write('<th>Filename</th>\n')
file.write('<th>Good Image</th>\n')
@@ -122,26 +128,30 @@
# 2. Analyze images
# 3. Report Output
for filename in os.listdir(sys.path[0]):
- if filename != 'output' and filename != 'render' and filename != 'anim' and filename != '.svn' and filename != 'index.html' and filename != sys.argv[0]:
+ if filename.find('.blend') != -1:
print filename
render(filename)
- unittest.TextTestRunner(verbosity=2).run(suite())
+ tr = unittest.TextTestRunner(verbosity=2).run(suite())
file.write('<tr>\n')
file.write('<td>' + filename + '</td>\n')
- file.write('<td><img src="' + os.path.join('render', filename + '.png') + '" alt="Good Image" width="200" height="150"></td>\n')
- file.write('<td><img src="' + os.path.join('output', filename + '_0001.png') + '" alt="Latest Render" width="200" height="150"></td>\n')
- if True:
- file.write('<td>OK</td>\n')
+ file.write('<td><img src="' + os.path.join('render', string.replace(filename, '.blend', '.png')) + '" alt="Good Image" width="200" height="150"></td>\n')
+ file.write('<td><img src="' + os.path.join('output', string.replace(filename, '.blend', '_0001.png')) + '" alt="Latest Render" width="200" height="150"></td>\n')
+ if tr.wasSuccessful():
+ passed.append(filename)
+ file.write('<td>OK</td>\n')
else:
+ failed.append(filename)
file.write('<td>FAIL</td>\n')
file.write('<tr>\n')
# Finish up
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list