diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-20 21:07:25 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-20 21:07:25 +0300 |
commit | 9a9336cb45bd8bfced0c448951843227347bc996 (patch) | |
tree | fc64609b137a39766f72eca1736c9a295f6ccdf9 | |
parent | 5df82b60d1dfe980a0314518143349dd918e0e9f (diff) | |
parent | 848f589fdf36c43ea537f93a8213b5ea362949a3 (diff) |
Merge branch 'blender2.7'
-rw-r--r-- | intern/cycles/device/opencl/opencl_split.cpp | 1 | ||||
-rw-r--r-- | tests/python/CMakeLists.txt | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp index 853b2addb20..c8f4c2a94c5 100644 --- a/intern/cycles/device/opencl/opencl_split.cpp +++ b/intern/cycles/device/opencl/opencl_split.cpp @@ -486,7 +486,6 @@ OpenCLDevice::OpenCLDevice(DeviceInfo& info, Stats &stats, Profiler &profiler, b device_initialized = true; split_kernel = new OpenCLSplitKernel(this); - background = background; } OpenCLDevice::~OpenCLDevice() diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 760b0ce075e..914481f37c9 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -577,17 +577,19 @@ endif() if(WITH_OPENGL_DRAW_TESTS) if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/opengl") - # Use all test folders - file(GLOB children RELATIVE ${TEST_SRC_DIR} ${TEST_SRC_DIR}/*) + # Use all subdirectories of opengl folder. + file(GLOB children RELATIVE ${TEST_SRC_DIR}/opengl ${TEST_SRC_DIR}/opengl/*) foreach(child ${children}) - if(IS_DIRECTORY ${TEST_SRC_DIR}/${child}) - file(GLOB_RECURSE blends "${TEST_SRC_DIR}/${child}/*.blend") + # Resolve symlinks, useful to test production files with linked libraries. + get_filename_component(child_path ${TEST_SRC_DIR}/opengl/${child} REALPATH) + if(IS_DIRECTORY ${child_path}) + file(GLOB_RECURSE blends "${child_path}/*.blend") if(blends) add_python_test( opengl_draw_${child}_test ${CMAKE_CURRENT_LIST_DIR}/opengl_draw_tests.py -blender "$<TARGET_FILE:blender>" - -testdir "${TEST_SRC_DIR}/${child}" + -testdir "${child_path}" -idiff "${OPENIMAGEIO_IDIFF}" -outdir "${TEST_OUT_DIR}/opengl_draw" ) |