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

[Thomas Dinges]

Revision: 52723
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52723
Author:   dingto
Date:     2012-12-03 00:36:23 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Cycles Test Suite:
* All blend files now have a test.py inbuilt, which imports the external test_utils.py and executes that. 

Modified Paths:
--------------
    trunk/lib/tests/rendering/cycles/blend_files/bmps.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/images.blend
    trunk/lib/tests/rendering/cycles/blend_files/object_info_node.blend
    trunk/lib/tests/rendering/cycles/blend_files/procedural_textures.blend
    trunk/lib/tests/rendering/cycles/readme.txt
    trunk/lib/tests/rendering/cycles/render_test_files.py

Added Paths:
-----------
    trunk/lib/tests/rendering/cycles/test_utils.py

Removed Paths:
-------------
    trunk/lib/tests/rendering/cycles/set_shading_system.py

Modified: trunk/lib/tests/rendering/cycles/blend_files/bmps.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/images.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/procedural_textures.blend
===================================================================
(Binary files differ)

Modified: trunk/lib/tests/rendering/cycles/readme.txt
===================================================================
--- trunk/lib/tests/rendering/cycles/readme.txt	2012-12-02 20:08:11 UTC (rev 52722)
+++ trunk/lib/tests/rendering/cycles/readme.txt	2012-12-03 00:36:23 UTC (rev 52723)
@@ -3,9 +3,7 @@
 
 Notes
 ==================================
-* All files have a script to render now. The script auto runs on file load.
-* If you want to open a file without it, start without scripts.
-(Uncheck "Trusted Source" in file browser or start Blender with -Y)
+* All files have a inbuilt test.py script now, which imports the external test_utils.py and executes that.
 * The script renders every file twice on the CPU (SVM and OSL). 
 
 Usage

Modified: trunk/lib/tests/rendering/cycles/render_test_files.py
===================================================================
--- trunk/lib/tests/rendering/cycles/render_test_files.py	2012-12-02 20:08:11 UTC (rev 52722)
+++ trunk/lib/tests/rendering/cycles/render_test_files.py	2012-12-03 00:36:23 UTC (rev 52723)
@@ -1,5 +1,4 @@
 # Run auto regression files
-
 import os
 
 # Absolute path to the blender folder

Deleted: trunk/lib/tests/rendering/cycles/set_shading_system.py
===================================================================
--- trunk/lib/tests/rendering/cycles/set_shading_system.py	2012-12-02 20:08:11 UTC (rev 52722)
+++ trunk/lib/tests/rendering/cycles/set_shading_system.py	2012-12-03 00:36:23 UTC (rev 52723)
@@ -1,21 +0,0 @@
-import os
-import bpy
-
-# Only run in background mode
-if bpy.app.background:
-
-    # Get the filename
-    basename = os.path.basename(bpy.data.filepath)
-    filename = basename.strip('.blend')
-
-    # ##### SVM #####
-    bpy.context.scene.cycles['shading_system'] = 0
-    bpy.context.scene.render.filepath = "test_renders/%s_svm" % filename
-
-    bpy.ops.render.render(write_still=True)
-
-    # ##### OSL #####
-    bpy.context.scene.cycles['shading_system'] = 1
-    bpy.context.scene.render.filepath = "test_renders/%s_osl" % filename
-
-    bpy.ops.render.render(write_still=True)
\ No newline at end of file

Copied: trunk/lib/tests/rendering/cycles/test_utils.py (from rev 52706, trunk/lib/tests/rendering/cycles/set_shading_system.py)
===================================================================
--- trunk/lib/tests/rendering/cycles/test_utils.py	                        (rev 0)
+++ trunk/lib/tests/rendering/cycles/test_utils.py	2012-12-03 00:36:23 UTC (rev 52723)
@@ -0,0 +1,26 @@
+import os
+import bpy
+
+def main():
+
+    # Only run in background mode
+    if bpy.app.background:
+    
+        # 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 #####
+        bpy.context.scene.cycles['shading_system'] = 0
+        bpy.context.scene.render.filepath = "%s/test_renders/%s_svm" % (cycles_dir, filename)
+        bpy.ops.render.render(write_still=True)
+
+        # ##### OSL #####
+        bpy.context.scene.cycles['shading_system'] = 1
+        bpy.context.scene.render.filepath = "%s/test_renders/%s_osl" % (cycles_dir, filename)
+        bpy.ops.render.render(write_still=True)
\ No newline at end of file