[Bf-blender-cvs] [5dbee81] cycles_ctests: Cycles ctests: Automatically find idiff application

[Sergey Sharybin]

Commit: 5dbee81d591286da5a567cd2087a06f663e7d27d
Author: Sergey Sharybin
Date:   Thu Jan 22 04:03:01 2015 +0500
Branches: cycles_ctests
https://developer.blender.org/rB5dbee81d591286da5a567cd2087a06f663e7d27d

Cycles ctests: Automatically find idiff application

===================================================================

M	build_files/cmake/Modules/FindOpenImageIO.cmake
M	tests/python/CMakeLists.txt
M	tests/python/cycles/render_tests.py

===================================================================

diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake
index f8d6612..6b82c9d 100644
--- a/build_files/cmake/Modules/FindOpenImageIO.cmake
+++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
@@ -8,6 +8,7 @@
 #                        This can also be an environment variable.
 #  OPENIMAGEIO_FOUND, If false, do not try to use OpenImageIO.
 #  OPENIMAGEIO_PUGIXML_FOUND, Indicates whether OIIO has biltin PuguXML parser.
+#  OPENIMAGEIO_IDIFF, full path to idiff application if found.
 #
 # also defined, but not for general use are
 #  OPENIMAGEIO_LIBRARY, where to find the OpenImageIO library.
@@ -55,6 +56,14 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY
     lib64 lib
   )
 
+FIND_FILE(OPENIMAGEIO_IDIFF
+  NAMES
+    idiff
+  ${OPENIMAGEIO_ROOT_DIR}
+  PATH_SUFFIXES
+    bin
+)
+
 # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 242972e..46ea1d6 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -361,9 +361,12 @@ add_test(export_fbx_all_objects ${TEST_BLENDER_EXE}
 )
 
 if(WITH_CYCLES)
-	add_test(cycles_shaders_test
-		${CMAKE_CURRENT_LIST_DIR}/cycles/render_tests.py
-		-blender "${TEST_BLENDER_EXE_BARE}"
-		-testdir "${TEST_SRC_DIR}/cycles/ctests/shader"
-	)
+	if(OPENIMAGEIO_IDIFF)
+		add_test(cycles_shaders_test
+			${CMAKE_CURRENT_LIST_DIR}/cycles/render_tests.py
+			-blender "${TEST_BLENDER_EXE_BARE}"
+			-testdir "${TEST_SRC_DIR}/cycles/ctests/shader"
+			-idiff "${OPENIMAGEIO_IDIFF}"
+		)
+	endif()
 endif()
diff --git a/tests/python/cycles/render_tests.py b/tests/python/cycles/render_tests.py
index 68a35f7..ee80a0b 100755
--- a/tests/python/cycles/render_tests.py
+++ b/tests/python/cycles/render_tests.py
@@ -9,10 +9,12 @@ import tempfile
 parser = argparse.ArgumentParser()
 parser.add_argument('-blender', nargs='+')
 parser.add_argument('-testdir', nargs=1)
+parser.add_argument('-idiff', nargs=1)
 args = parser.parse_args()
 
 BLENDER = args.blender[0]
 ROOT = args.testdir[0]
+IDIFF = args.idiff[0]
 
 TEMP = tempfile.mkdtemp()
 TEMP_FILE_MASK = os.path.join(TEMP, "test")
@@ -54,7 +56,7 @@ def verify_output(filepath):
     reference_image = os.path.join(reference_dirpath, testname + '.png')
     if not os.path.exists(reference_image):
         return False
-    command = ['idiff',
+    command = [IDIFF,
                '-fail', '0.01',
                '-failpercent', '1',
                reference_image,