From fda79dbd79fbcb1caa2fdee87ed9d4ea46009e57 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 20 Feb 2019 16:32:06 +0100 Subject: Cleanup: fix compiler warning. --- intern/cycles/device/opencl/opencl_split.cpp | 1 - 1 file changed, 1 deletion(-) 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() -- cgit v1.2.3 From 848f589fdf36c43ea537f93a8213b5ea362949a3 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 20 Feb 2019 16:03:13 +0100 Subject: Tests: only run OpenGL draw tests on lib/tests/opengl, support symlinks. To keep running these tests relatively fast and practical to run often, running it on all .blend files is a bit much. So now we only run it on files from this directory. Additionally this adds supports for following symlinks, so that you can easily symlinks to other directories if you want to tests extra files which may have linked libraries. --- tests/python/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 46e917226e4..23d32821c5b 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -572,17 +572,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 "$" - -testdir "${TEST_SRC_DIR}/${child}" + -testdir "${child_path}" -idiff "${OPENIMAGEIO_IDIFF}" -outdir "${TEST_OUT_DIR}/opengl_draw" ) -- cgit v1.2.3