diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2017-06-05 02:05:59 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2017-06-05 02:05:59 +0300 |
| commit | 7bff00b522d689fcf45bc08c453d042f2f83e3e1 (patch) | |
| tree | 2bbbc4a9e5f993fdf87d7be21aa6107da7fc4c63 | |
| parent | 556942ec0782c5641c3542535988c507be0a51a6 (diff) | |
Fix alembic tests not running with debug build on windows
| -rw-r--r-- | tests/python/CMakeLists.txt | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index ac480f4d58c..d3067a22ee7 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -49,7 +49,8 @@ endif() # for testing with valgrind prefix: valgrind --track-origins=yes --error-limit=no set(TEST_BLENDER_EXE_BARE ${TEST_BLENDER_EXE}) -set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts) +set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts) +set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} ${TEST_BLENDER_EXE_PARAMS} ) # ------------------------------------------------------------------------------ @@ -458,12 +459,6 @@ if(WITH_ALEMBIC) get_filename_component(real_include_dir ${ALEMBIC_INCLUDE_DIR} REALPATH) get_filename_component(ALEMBIC_ROOT_DIR ${real_include_dir} DIRECTORY) - add_test(script_alembic_import ${TEST_BLENDER_EXE} - --python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py - -- - --testdir "${TEST_SRC_DIR}/alembic" - ) - if(MSVC) add_test(NAME alembic_tests COMMAND @@ -473,6 +468,14 @@ if(WITH_ALEMBIC) --testdir "${TEST_SRC_DIR}/alembic" --alembic-root "${ALEMBIC_ROOT_DIR}" ) + add_test(NAME script_alembic_import + COMMAND + "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS} + --python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py + -- + --testdir "${TEST_SRC_DIR}/alembic" + ) + else() add_test(alembic_tests ${CMAKE_CURRENT_LIST_DIR}/alembic_tests.py @@ -480,5 +483,11 @@ if(WITH_ALEMBIC) --testdir "${TEST_SRC_DIR}/alembic" --alembic-root "${ALEMBIC_ROOT_DIR}" ) + add_test(script_alembic_import ${TEST_BLENDER_EXE} + --python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py + -- + --testdir "${TEST_SRC_DIR}/alembic" + ) + endif() endif() |