[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30862] branches/soc-2010-leifandersen: 1.

[Leif Andersen]

Revision: 30862
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30862
Author:   leifandersen
Date:     2010-07-29 05:50:27 +0200 (Thu, 29 Jul 2010)

Log Message:
-----------
1.  Removed gtest from the build.

2.  Got the frame skip actually working.

Modified Paths:
--------------
    branches/soc-2010-leifandersen/extern/CMakeLists.txt
    branches/soc-2010-leifandersen/tests/CMakeLists.txt
    branches/soc-2010-leifandersen/tests/render/run.py

Removed Paths:
-------------
    branches/soc-2010-leifandersen/extern/gtest-1.5.0/
    branches/soc-2010-leifandersen/tests/gtest/
    branches/soc-2010-leifandersen/tests/scripts/

Modified: branches/soc-2010-leifandersen/extern/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/extern/CMakeLists.txt	2010-07-29 03:20:37 UTC (rev 30861)
+++ branches/soc-2010-leifandersen/extern/CMakeLists.txt	2010-07-29 03:50:27 UTC (rev 30862)
@@ -45,9 +45,3 @@
 IF(WITH_LZMA)
 	ADD_SUBDIRECTORY(lzma)
 ENDIF(WITH_LZMA)
-
-#-----------------------------------------------------------------------------
-if(WITH_TESTS)
-	ADD_SUBDIRECTORY(gtest-1.5.0)
-	# ADD_SUBDIRECTORY(perceptualdiff)
-ENDIF(WITH_TESTS)

Modified: branches/soc-2010-leifandersen/tests/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/CMakeLists.txt	2010-07-29 03:20:37 UTC (rev 30861)
+++ branches/soc-2010-leifandersen/tests/CMakeLists.txt	2010-07-29 03:50:27 UTC (rev 30862)
@@ -24,7 +24,6 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 ENABLE_TESTING()
-ADD_SUBDIRECTORY(gtest)
 ADD_SUBDIRECTORY(pyunit)
 
 ADD_TEST(Image_Diffs python ${Blender_BINARY_DIR}/tests/render/run.py --blender-bin ${Blender_BINARY_DIR}/bin/blender)

Modified: branches/soc-2010-leifandersen/tests/render/run.py
===================================================================
--- branches/soc-2010-leifandersen/tests/render/run.py	2010-07-29 03:20:37 UTC (rev 30861)
+++ branches/soc-2010-leifandersen/tests/render/run.py	2010-07-29 03:50:27 UTC (rev 30862)
@@ -244,10 +244,10 @@
            
         # Render depending on the verbosity needed
         if verbose:
-            command = blender_bin + ' -b ' + self.blend_path + " -o " + os.path.join(self.test_path,string.replace(self.name,'.blend','_####')) + ' -F PNG -x 1 -a -j 15'
+            command = blender_bin + ' -b ' + self.blend_path + " -o " + os.path.join(self.test_path,string.replace(self.name,'.blend','_####')) + ' -F PNG -x 1 -j 15 -a'
             os.system(command)
         else:
-            p = Popen([blender_bin, '-b', self.blend_path, '-o', os.path.join(self.test_path,string.replace(self.name,'.blend','_####')), '-F', 'PNG', '-x', '1', '-a', '-j', '15'], stdout=None, stderr=None, stdin=None)
+            p = Popen([blender_bin, '-b', self.blend_path, '-o', os.path.join(self.test_path,string.replace(self.name,'.blend','_####')), '-F', 'PNG', '-x', '1', '-j', '15', '-a'], stdout=None, stderr=None, stdin=None)
             p.wait()
             
         # Modify self.test_path for later use