[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55064] trunk/lib/tests/rendering/cycles: Cycles test rendering script

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Mar 5 23:34:16 CET 2013


Revision: 55064
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55064
Author:   blendix
Date:     2013-03-05 22:34:15 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
Cycles test rendering script

* Support running the script from blender so the path to the executable does
  not need to be specified in the script.
* Add support for automatic diffing between renders if OpenImageIO idiff is
  installed.
* Print compact output that still shows progress but just prints OK/Failed at
  the end with full output written to log files.
* Remove test.py from .blend files and run it with -P option, easier to add
  new .blend files then and make changes to the script.
* Update reference renders, some did not have the same resolution as the
  .blend files which makes diff fail.

Modified Paths:
--------------
    trunk/lib/tests/rendering/cycles/blend_files/bmps.blend
    trunk/lib/tests/rendering/cycles/blend_files/bmw.blend
    trunk/lib/tests/rendering/cycles/blend_files/closures.blend
    trunk/lib/tests/rendering/cycles/blend_files/color_ramp.blend
    trunk/lib/tests/rendering/cycles/blend_files/cornell_box.blend
    trunk/lib/tests/rendering/cycles/blend_files/hair.blend
    trunk/lib/tests/rendering/cycles/blend_files/images.blend
    trunk/lib/tests/rendering/cycles/blend_files/lamps.blend
    trunk/lib/tests/rendering/cycles/blend_files/motion_blur.blend
    trunk/lib/tests/rendering/cycles/blend_files/object_info_node.blend
    trunk/lib/tests/rendering/cycles/blend_files/osl.blend
    trunk/lib/tests/rendering/cycles/blend_files/procedural_textures.blend
    trunk/lib/tests/rendering/cycles/blend_files/render_passes.blend
    trunk/lib/tests/rendering/cycles/readme.txt
    trunk/lib/tests/rendering/cycles/reference_renders/bmps_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/bmps_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/closures_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/closures_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/color_ramp_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/color_ramp_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/cornell_box_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/cornell_box_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/hair_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/hair_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/images_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/images_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/information.txt
    trunk/lib/tests/rendering/cycles/reference_renders/lamps_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/lamps_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/osl_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/osl_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/procedural_textures_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/procedural_textures_svm.png
    trunk/lib/tests/rendering/cycles/render_test_files.py
    trunk/lib/tests/rendering/cycles/test_utils.py

Added Paths:
-----------
    trunk/lib/tests/rendering/cycles/reference_renders/bmw_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/bmw_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/motion_blur_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/motion_blur_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/object_info_node_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/object_info_node_svm.png
    trunk/lib/tests/rendering/cycles/reference_renders/render_passes_osl.png
    trunk/lib/tests/rendering/cycles/reference_renders/render_passes_svm.png
    trunk/lib/tests/rendering/cycles/test_config.py
    trunk/lib/tests/rendering/cycles/test_run.py

Modified: trunk/lib/tests/rendering/cycles/blend_files/bmps.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/bmw.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/closures.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/color_ramp.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/cornell_box.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/hair.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/images.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/lamps.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/motion_blur.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/object_info_node.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/osl.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/procedural_textures.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/blend_files/render_passes.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/readme.txt
===================================================================
--- trunk/lib/tests/rendering/cycles/readme.txt	2013-03-05 21:32:46 UTC (rev 55063)
+++ trunk/lib/tests/rendering/cycles/readme.txt	2013-03-05 22:34:15 UTC (rev 55064)
@@ -1,14 +1,32 @@
 Cycles Auto Regression suite
 ==================================
 
+Running
+==================================
+
+./blender -b -P /path/to/tests/rendering/cycles/render_test_files.py
+
+If desired the blender executable path can be set in test_config.py to
+run the script outside of Blender with:
+
+python render_test_files.py
+
+Results
+==================================
+
+It saves all renders and additional info into tests/rendering/cycles/test_renders
+The reference renders are in tests/rendering/cycles/reference_renders
+
+Comparisons
+==================================
+
+Manually comparison is possible, easier is to use automatic comparsion with
+OpenImageIO installed. If it's in PATH then it will be found automatically,
+otherwise the path can be set in test_config.py.
+
 Notes
 ==================================
-* All files have a inbuilt test.py script now, which imports the external test_utils.py and executes that.
+
+* test_run.py is executed for each .blend file.
 * The script renders every file twice on the CPU (SVM and OSL). 
 
-Usage
-==================================
-* Set the absolute path to your blender binary inside of "render_test_files.py"
-* Run render_test_files.py
-* It saves all renders and additional info into tests/rendering/cycles/test_renders
-* Compare the results with the images in tests/rendering/cycles/reference_renders

Modified: trunk/lib/tests/rendering/cycles/reference_renders/bmps_osl.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/bmps_svm.png
===================================================================
(Binary files differ)

Added: trunk/lib/tests/rendering/cycles/reference_renders/bmw_osl.png
===================================================================
(Binary files differ)


Property changes on: trunk/lib/tests/rendering/cycles/reference_renders/bmw_osl.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/lib/tests/rendering/cycles/reference_renders/bmw_svm.png
===================================================================
(Binary files differ)


Property changes on: trunk/lib/tests/rendering/cycles/reference_renders/bmw_svm.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: trunk/lib/tests/rendering/cycles/reference_renders/closures_osl.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/closures_svm.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/color_ramp_osl.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/color_ramp_svm.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/cornell_box_osl.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/cornell_box_svm.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/hair_osl.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/hair_svm.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/images_osl.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/images_svm.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/information.txt
===================================================================
--- trunk/lib/tests/rendering/cycles/reference_renders/information.txt	2013-03-05 21:32:46 UTC (rev 55063)
+++ trunk/lib/tests/rendering/cycles/reference_renders/information.txt	2013-03-05 22:34:15 UTC (rev 55064)
@@ -1,2 +1,2 @@
 These reference images have been renderd with:
-SVN 52704 on Windows 7 x64
\ No newline at end of file
+SVN 55063 on Mac OS X 10.8

Modified: trunk/lib/tests/rendering/cycles/reference_renders/lamps_osl.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/lamps_svm.png
===================================================================
(Binary files differ)

Added: trunk/lib/tests/rendering/cycles/reference_renders/motion_blur_osl.png
===================================================================
(Binary files differ)


Property changes on: trunk/lib/tests/rendering/cycles/reference_renders/motion_blur_osl.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/lib/tests/rendering/cycles/reference_renders/motion_blur_svm.png
===================================================================
(Binary files differ)


Property changes on: trunk/lib/tests/rendering/cycles/reference_renders/motion_blur_svm.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/lib/tests/rendering/cycles/reference_renders/object_info_node_osl.png
===================================================================
(Binary files differ)


Property changes on: trunk/lib/tests/rendering/cycles/reference_renders/object_info_node_osl.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/lib/tests/rendering/cycles/reference_renders/object_info_node_svm.png
===================================================================
(Binary files differ)


Property changes on: trunk/lib/tests/rendering/cycles/reference_renders/object_info_node_svm.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: trunk/lib/tests/rendering/cycles/reference_renders/osl_osl.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/osl_svm.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/procedural_textures_osl.png
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/reference_renders/procedural_textures_svm.png
===================================================================
(Binary files differ)

Added: trunk/lib/tests/rendering/cycles/reference_renders/render_passes_osl.png
===================================================================
(Binary files differ)


Property changes on: trunk/lib/tests/rendering/cycles/reference_renders/render_passes_osl.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/lib/tests/rendering/cycles/reference_renders/render_passes_svm.png
===================================================================
(Binary files differ)


Property changes on: trunk/lib/tests/rendering/cycles/reference_renders/render_passes_svm.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: trunk/lib/tests/rendering/cycles/render_test_files.py
===================================================================
--- trunk/lib/tests/rendering/cycles/render_test_files.py	2013-03-05 21:32:46 UTC (rev 55063)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list