Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-17 14:54:19 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-17 14:54:19 +0300
commite69192968616b17709e6a3bd0d2dc59d463c52ba (patch)
tree4018a1dc7f631ad340b11c0b738fade9f24d0c6e /tests
parent0af22625c9f9357e873160d265b9eae4a43a549d (diff)
parent9d2397c710af9180e7e2ec6db42e8513390b4ab1 (diff)
Merge branch 'blender2.7'
Diffstat (limited to 'tests')
-rw-r--r--tests/python/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 914481f37c9..b2def0a310f 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -532,7 +532,7 @@ if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/render/ctests/shader")
macro(add_cycles_render_test subject)
if(WITH_CYCLES)
add_python_test(
- cycles_${subject}_test
+ cycles_${subject}
${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py
-blender "$<TARGET_FILE:blender>"
-testdir "${TEST_SRC_DIR}/render/ctests/${subject}"
@@ -586,7 +586,7 @@ if(WITH_OPENGL_DRAW_TESTS)
file(GLOB_RECURSE blends "${child_path}/*.blend")
if(blends)
add_python_test(
- opengl_draw_${child}_test
+ opengl_draw_${child}
${CMAKE_CURRENT_LIST_DIR}/opengl_draw_tests.py
-blender "$<TARGET_FILE:blender>"
-testdir "${child_path}"
@@ -630,7 +630,7 @@ endif()
if(WITH_CODEC_FFMPEG)
add_python_test(
- ffmpeg_tests
+ ffmpeg
${CMAKE_CURRENT_LIST_DIR}/ffmpeg_tests.py
--blender "$<TARGET_FILE:blender>"
--testdir "${TEST_DATA_SRC_DIR}/ffmpeg"