diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gtests/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/gtests/blenlib/BLI_string_test.cc | 2 | ||||
-rw-r--r-- | tests/gtests/testing/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/python/CMakeLists.txt | 40 |
4 files changed, 26 insertions, 22 deletions
diff --git a/tests/gtests/CMakeLists.txt b/tests/gtests/CMakeLists.txt index a3860ce3e67..1d363f31119 100644 --- a/tests/gtests/CMakeLists.txt +++ b/tests/gtests/CMakeLists.txt @@ -4,6 +4,9 @@ if(WITH_GTESTS) Include(GTestTesting) + add_definitions(${GFLAGS_DEFINES}) + add_definitions(${GLOG_DEFINES}) + # Otherwise we get warnings here that we cant fix in external projects remove_strict_flags() diff --git a/tests/gtests/blenlib/BLI_string_test.cc b/tests/gtests/blenlib/BLI_string_test.cc index 17a4b5e82b9..08f2a745bdb 100644 --- a/tests/gtests/blenlib/BLI_string_test.cc +++ b/tests/gtests/blenlib/BLI_string_test.cc @@ -374,7 +374,7 @@ TEST(string, StrFormatIntGrouped) const int word_num = BLI_string_find_split_words( \ word_str_src, word_str_src_len, ' ', word_info, word_cmp_size_input); \ EXPECT_EQ(word_num, word_cmp_size - 1); \ - EXPECT_EQ_ARRAY_ND(word_cmp, word_info, word_cmp_size, 2); \ + EXPECT_EQ_ARRAY_ND<const int[2]>(word_cmp, word_info, word_cmp_size, 2); \ } ((void)0) #define STRING_FIND_SPLIT_WORDS(word_str_src, ...) \ diff --git a/tests/gtests/testing/CMakeLists.txt b/tests/gtests/testing/CMakeLists.txt index 1eb60e7f3b5..796f975ea65 100644 --- a/tests/gtests/testing/CMakeLists.txt +++ b/tests/gtests/testing/CMakeLists.txt @@ -47,7 +47,4 @@ set(SRC testing.h ) -add_definitions(${GFLAGS_DEFINES}) -add_definitions(${GLOG_DEFINES}) - blender_add_lib(bf_testing_main "${SRC}" "${INC}" "${INC_SYS}") diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index a29b612e0ef..4b5666e9b5a 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -399,24 +399,28 @@ endif() if(WITH_CYCLES) if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/cycles/ctests/shader") - add_test(cycles_reports_test - ${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py - -blender "${TEST_BLENDER_EXE_BARE}" - -testdir "${TEST_SRC_DIR}/cycles/ctests/reports" - -idiff "${OPENIMAGEIO_IDIFF}" - ) - add_test(cycles_render_test - ${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py - -blender "${TEST_BLENDER_EXE_BARE}" - -testdir "${TEST_SRC_DIR}/cycles/ctests/render" - -idiff "${OPENIMAGEIO_IDIFF}" - ) - add_test(cycles_shaders_test - ${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py - -blender "${TEST_BLENDER_EXE_BARE}" - -testdir "${TEST_SRC_DIR}/cycles/ctests/shader" - -idiff "${OPENIMAGEIO_IDIFF}" - ) + macro(add_cycles_render_test subject) + if(MSVC) + add_test(NAME cycles_${subject}_test + COMMAND + "$<TARGET_FILE_DIR:blender>/${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}/python/bin/python$<$<CONFIG:Debug>:_d>" + ${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py + -blender "$<TARGET_FILE:blender>" + -testdir "${TEST_SRC_DIR}/cycles/ctests/${subject}" + -idiff "${OPENIMAGEIO_IDIFF}" + ) + else() + add_test(cycles_${subject}_test + ${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py + -blender "${TEST_BLENDER_EXE_BARE}" + -testdir "${TEST_SRC_DIR}/cycles/ctests/${subject}" + -idiff "${OPENIMAGEIO_IDIFF}" + ) + endif() + endmacro() + add_cycles_render_test(reports) + add_cycles_render_test(render) + add_cycles_render_test(shader) else() MESSAGE(STATUS "Disabling Cycles tests because tests folder does not exist") endif() |