[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52726] trunk/lib/tests/rendering/cycles: Cycles Test Suite:

[Thomas Dinges]

Revision: 52726
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52726
Author:   dingto
Date:     2012-12-03 02:25:19 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Cycles Test Suite:
* Some more modularization. 

Modified Paths:
--------------
    trunk/lib/tests/rendering/cycles/readme.txt
    trunk/lib/tests/rendering/cycles/render_test_files.py
    trunk/lib/tests/rendering/cycles/test_utils.py

Modified: trunk/lib/tests/rendering/cycles/readme.txt
===================================================================
--- trunk/lib/tests/rendering/cycles/readme.txt	2012-12-03 01:46:37 UTC (rev 52725)
+++ trunk/lib/tests/rendering/cycles/readme.txt	2012-12-03 02:25:19 UTC (rev 52726)
@@ -10,5 +10,5 @@
 ==================================
 * Set the absolute path to your blender binary inside of "render_test_files.py"
 * Run render_test_files.py
-* It saves all renders in tests/rendering/cycles/test_renders
+* 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/render_test_files.py
===================================================================
--- trunk/lib/tests/rendering/cycles/render_test_files.py	2012-12-03 01:46:37 UTC (rev 52725)
+++ trunk/lib/tests/rendering/cycles/render_test_files.py	2012-12-03 02:25:19 UTC (rev 52726)
@@ -2,7 +2,7 @@
 import os
 
 # Absolute path to the blender folder
-blender_binary = "D:/blender_dev/code/lib/tests/rendering/cycles/blender/blender.exe"
+blender_binary = "D:/blender_dev/install/trunk/blender.exe"
 
 # Blend files
 blend_files = (

Modified: trunk/lib/tests/rendering/cycles/test_utils.py
===================================================================
--- trunk/lib/tests/rendering/cycles/test_utils.py	2012-12-03 01:46:37 UTC (rev 52725)
+++ trunk/lib/tests/rendering/cycles/test_utils.py	2012-12-03 02:25:19 UTC (rev 52726)
@@ -3,6 +3,15 @@
 import bpy
 import time
 
+# Get the cycles test directory
+filepath = bpy.data.filepath
+blend_files_dir = os.path.dirname(filepath)
+cycles_dir = os.path.dirname(blend_files_dir)
+
+# Get the filename without ending
+basename = os.path.basename(filepath)
+filename = os.path.splitext(basename)[0]
+
 def write_log_file(seconds, dir, blend_file, shading):
     rev = get_blender_revision()
     seconds = round(seconds, 2)
@@ -28,22 +37,8 @@
         bpy.context.scene.cycles['shading_system'] = 0
     elif system == 'osl':
         bpy.context.scene.cycles['shading_system'] = 1
-
-def main():
-    # Only run in background mode
-    if not is_background():
-        return
-
-    # Get the cycles test directory
-    filepath = bpy.data.filepath
-    blend_files_dir = os.path.dirname(filepath)
-    cycles_dir = os.path.dirname(blend_files_dir)
-
-    # Get the filename without ending
-    basename = os.path.basename(filepath)
-    filename = os.path.splitext(basename)[0]
-
-    # ##### SVM #####
+        
+def render_svm():
     set_shading_system("svm")
     bpy.context.scene.render.filepath = "%s/test_renders/%s_svm" % (cycles_dir, filename)
     
@@ -51,12 +46,20 @@
     bpy.ops.render.render(write_still=True)
     end_time = time.time()
     write_log_file((end_time-start_time), cycles_dir, basename, "svm")
-
-    # ##### OSL #####
+    
+def render_osl():
     set_shading_system("osl")
     bpy.context.scene.render.filepath = "%s/test_renders/%s_osl" % (cycles_dir, filename)
     
     start_time = time.time()
     bpy.ops.render.render(write_still=True)
     end_time = time.time()
-    write_log_file((end_time-start_time), cycles_dir, basename, "osl")
\ No newline at end of file
+    write_log_file((end_time-start_time), cycles_dir, basename, "osl")
+
+def main():
+    # Only run in background mode
+    if not is_background():
+        return
+
+    render_svm()
+    render_osl()
\ No newline at end of file