diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-18 18:11:19 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-18 18:11:19 +0300 |
commit | 00071d78bcfbe8ae0c813c769af075f069d2cb8d (patch) | |
tree | a0c26c6fb4caa5f65f22a00e1785dfb40e3669d3 /tests | |
parent | 29595334f06107c484e928358715b55dac3e840d (diff) | |
parent | d712dd2f19a25a992761f881bdaabc85334cab05 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'tests')
-rw-r--r-- | tests/python/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 92eb50831aa..50e2927f54f 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -532,13 +532,13 @@ function(add_python_test testname testscript) endfunction() if(WITH_CYCLES) - if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/cycles/ctests/shader") + if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/render/ctests/shader") macro(add_cycles_render_test subject) add_python_test( cycles_${subject}_test ${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py -blender "$<TARGET_FILE:blender>" - -testdir "${TEST_SRC_DIR}/cycles/ctests/${subject}" + -testdir "${TEST_SRC_DIR}/render/ctests/${subject}" -idiff "${OPENIMAGEIO_IDIFF}" -outdir "${TEST_OUT_DIR}/cycles" ) |