[Bf-blender-cvs] [4749edccdda] master: Tests: Point ffmpeg data to a new folder
Sergey Sharybin
noreply at git.blender.org
Mon Jul 1 17:19:05 CEST 2019
Commit: 4749edccddaeffdac47c9dee004b9a5a5a37e48d
Author: Sergey Sharybin
Date: Mon Jul 1 17:18:43 2019 +0200
Branches: master
https://developer.blender.org/rB4749edccddaeffdac47c9dee004b9a5a5a37e48d
Tests: Point ffmpeg data to a new folder
===================================================================
M tests/python/CMakeLists.txt
===================================================================
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 52ff57c2b7e..fc59f7f2a2c 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -22,7 +22,6 @@
set(USE_EXPERIMENTAL_TESTS FALSE)
set(TEST_SRC_DIR ${CMAKE_SOURCE_DIR}/../lib/tests)
-set(TEST_DATA_SRC_DIR ${CMAKE_SOURCE_DIR}/../lib/tests_data)
set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
# ugh, any better way to do this on testing only?
@@ -648,7 +647,7 @@ if(WITH_CODEC_FFMPEG)
ffmpeg
${CMAKE_CURRENT_LIST_DIR}/ffmpeg_tests.py
--blender "$<TARGET_FILE:blender>"
- --testdir "${TEST_DATA_SRC_DIR}/ffmpeg"
+ --testdir "${TEST_SRC_DIR}/ffmpeg"
)
endif()
More information about the Bf-blender-cvs
mailing list