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:
authorCampbell Barton <campbell@blender.org>2022-09-23 07:33:44 +0300
committerCampbell Barton <campbell@blender.org>2022-09-23 07:33:44 +0300
commit998ace3463c73a172c62418e438bddc93f78a22e (patch)
treee384f1236d2d9c9bd40f8f6050e8364852974642 /tests
parentadd1b6ab3c91d408635b311127224dd4cc33f1ab (diff)
Cleanup: use lowercase function calls & macros in for CMake
This is already the case for most CMake usage. Although some find modules are an exception to this, as they were originally maintained externally they use some different conventions. Also corrected bad indentation in: intern/cycles/CMakeLists.txt
Diffstat (limited to 'tests')
-rw-r--r--tests/gtests/runner/CMakeLists.txt2
-rw-r--r--tests/python/CMakeLists.txt16
-rw-r--r--tests/python/collada/CMakeLists.txt4
-rw-r--r--tests/python/view_layer/CMakeLists.txt254
4 files changed, 138 insertions, 138 deletions
diff --git a/tests/gtests/runner/CMakeLists.txt b/tests/gtests/runner/CMakeLists.txt
index 97b95851be8..be0aa65d409 100644
--- a/tests/gtests/runner/CMakeLists.txt
+++ b/tests/gtests/runner/CMakeLists.txt
@@ -27,7 +27,7 @@ else()
endif()
# This builds `bin/tests/blender_test`, but does not add it as a single test.
-BLENDER_SRC_GTEST_EX(
+blender_src_gtest_ex(
NAME blender
SRC "${SRC}"
EXTRA_LIBS "${TEST_LIBS}"
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index ca3070b60ad..27473061304 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -632,13 +632,13 @@ endif()
if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
if(NOT OPENIMAGEIO_IDIFF)
- MESSAGE(WARNING "Disabling render tests because OIIO idiff does not exist")
+ message(WARNING "Disabling render tests because OIIO idiff does not exist")
elseif(NOT EXISTS "${TEST_SRC_DIR}/render/shader")
- MESSAGE(WARNING "Disabling render tests because tests folder does not exist at ${TEST_SRC_DIR}")
+ message(WARNING "Disabling render tests because tests folder does not exist at ${TEST_SRC_DIR}")
elseif(NOT WITH_COMPOSITOR_CPU)
- MESSAGE(WARNING "Disabling render tests because WITH_COMPOSITOR_CPU is disabled")
+ message(WARNING "Disabling render tests because WITH_COMPOSITOR_CPU is disabled")
elseif(NOT WITH_OPENCOLORIO)
- MESSAGE(WARNING "Disabling render tests because WITH_OPENCOLORIO is disabled")
+ message(WARNING "Disabling render tests because WITH_OPENCOLORIO is disabled")
else()
set(render_tests
camera
@@ -801,15 +801,15 @@ foreach(geo_node_test ${geo_node_tests})
)
endforeach()
else()
- MESSAGE(STATUS "Directory named ${TEST_SRC_DIR}/modeling/geometry_nodes/${geo_node_test}/ Not Found, disabling test.")
+ message(STATUS "Directory named ${TEST_SRC_DIR}/modeling/geometry_nodes/${geo_node_test}/ Not Found, disabling test.")
endif()
endforeach()
if(WITH_OPENGL_DRAW_TESTS)
if(NOT OPENIMAGEIO_IDIFF)
- MESSAGE(STATUS "Disabling OpenGL draw tests because OIIO idiff does not exist")
+ message(STATUS "Disabling OpenGL draw tests because OIIO idiff does not exist")
elseif(NOT EXISTS "${TEST_SRC_DIR}/opengl")
- MESSAGE(STATUS "Disabling OpenGL draw tests because tests folder does not exist at ${TEST_SRC_DIR}")
+ message(STATUS "Disabling OpenGL draw tests because tests folder does not exist at ${TEST_SRC_DIR}")
else()
# Use all subdirectories of opengl folder.
file(GLOB children RELATIVE ${TEST_SRC_DIR}/opengl ${TEST_SRC_DIR}/opengl/*)
@@ -881,7 +881,7 @@ endif()
# SEQUENCER RENDER TESTS
if(NOT OPENIMAGEIO_IDIFF)
- MESSAGE(STATUS "Disabling sequencer render tests because OIIO idiff does not exist")
+ message(STATUS "Disabling sequencer render tests because OIIO idiff does not exist")
else()
set(render_tests
transform
diff --git a/tests/python/collada/CMakeLists.txt b/tests/python/collada/CMakeLists.txt
index ecc092250c9..27388337de6 100644
--- a/tests/python/collada/CMakeLists.txt
+++ b/tests/python/collada/CMakeLists.txt
@@ -47,5 +47,5 @@ endmacro()
# Tests are disabled because they only work on Windows
# Tests will be redone completely to work reliable
#
-# COLLADA_TEST(mesh simple mesh_simple.blend)
-# COLLADA_TEST(animation simple suzannes_parent_inverse.blend)
+# collada_test(mesh simple mesh_simple.blend)
+# collada_test(animation simple suzannes_parent_inverse.blend)
diff --git a/tests/python/view_layer/CMakeLists.txt b/tests/python/view_layer/CMakeLists.txt
index 56dc1c8b5e9..8052d375d23 100644
--- a/tests/python/view_layer/CMakeLists.txt
+++ b/tests/python/view_layer/CMakeLists.txt
@@ -20,7 +20,7 @@ set(TEST_BLENDER_EXE $<TARGET_FILE:blender> --background -noaudio --factory-star
# ------------------------------------------------------------------------------
-macro(VIEW_LAYER_TEST test_name)
+macro(view_layer_test test_name)
# Adds ${CMAKE_CURRENT_LIST_DIR} to sys.path so that the tests can import
# things from view_layer_common.py
add_test(view_layer_${test_name} ${TEST_BLENDER_EXE}
@@ -31,129 +31,129 @@ macro(VIEW_LAYER_TEST test_name)
)
endmacro()
-VIEW_LAYER_TEST(active_collection)
-VIEW_LAYER_TEST(background_set)
-VIEW_LAYER_TEST(collection_new_sync)
-VIEW_LAYER_TEST(collection_rename_a)
-VIEW_LAYER_TEST(collection_rename_b)
-# VIEW_LAYER_TEST(evaluation_render_settings_a)
-# VIEW_LAYER_TEST(evaluation_render_settings_b)
-# VIEW_LAYER_TEST(evaluation_render_settings_c)
-# VIEW_LAYER_TEST(evaluation_render_settings_d)
-# VIEW_LAYER_TEST(evaluation_render_settings_e)
-# VIEW_LAYER_TEST(evaluation_render_settings_f)
-# VIEW_LAYER_TEST(evaluation_render_settings_g)
-# VIEW_LAYER_TEST(evaluation_render_settings_h)
-# VIEW_LAYER_TEST(evaluation_render_settings_i)
-VIEW_LAYER_TEST(evaluation_visibility_a)
-VIEW_LAYER_TEST(evaluation_visibility_b)
-VIEW_LAYER_TEST(evaluation_visibility_c)
-VIEW_LAYER_TEST(evaluation_visibility_d)
-VIEW_LAYER_TEST(evaluation_visibility_e)
-VIEW_LAYER_TEST(evaluation_visibility_f)
-VIEW_LAYER_TEST(evaluation_visibility_g)
-VIEW_LAYER_TEST(evaluation_visibility_h)
-VIEW_LAYER_TEST(evaluation_visibility_i)
-VIEW_LAYER_TEST(evaluation_visibility_j)
-VIEW_LAYER_TEST(evaluation_selectability_a)
-VIEW_LAYER_TEST(evaluation_selectability_b)
-VIEW_LAYER_TEST(evaluation_selectability_c)
-VIEW_LAYER_TEST(evaluation_selectability_d)
-VIEW_LAYER_TEST(evaluation_selectability_e)
-VIEW_LAYER_TEST(evaluation_selectability_f)
-VIEW_LAYER_TEST(group_a)
-VIEW_LAYER_TEST(group_b)
-VIEW_LAYER_TEST(group_c)
-VIEW_LAYER_TEST(group_d)
-VIEW_LAYER_TEST(group_e)
-VIEW_LAYER_TEST(object_add_cylinder)
-VIEW_LAYER_TEST(object_add_empty)
-VIEW_LAYER_TEST(object_add_torus)
-VIEW_LAYER_TEST(object_add_no_collection_cylinder)
-VIEW_LAYER_TEST(object_add_no_collection_empty)
-VIEW_LAYER_TEST(object_add_no_collection_torus)
-VIEW_LAYER_TEST(object_copy)
-VIEW_LAYER_TEST(object_delete_a)
-VIEW_LAYER_TEST(object_delete_b)
-VIEW_LAYER_TEST(object_link_a)
-VIEW_LAYER_TEST(object_link_b)
-VIEW_LAYER_TEST(object_link_c)
-VIEW_LAYER_TEST(operator_context)
-VIEW_LAYER_TEST(make_single_user)
-VIEW_LAYER_TEST(move_above_below_scene_collection_a)
-VIEW_LAYER_TEST(move_above_below_scene_collection_b)
-VIEW_LAYER_TEST(move_above_below_scene_collection_c)
-VIEW_LAYER_TEST(move_above_below_scene_collection_d)
-VIEW_LAYER_TEST(move_above_below_scene_collection_e)
-VIEW_LAYER_TEST(move_above_below_scene_collection_f)
-VIEW_LAYER_TEST(move_above_below_scene_collection_g)
-VIEW_LAYER_TEST(move_above_below_scene_collection_h)
-VIEW_LAYER_TEST(move_above_below_scene_collection_i)
-VIEW_LAYER_TEST(move_above_below_scene_collection_sync_a)
-VIEW_LAYER_TEST(move_above_below_scene_collection_sync_b)
-VIEW_LAYER_TEST(move_above_below_scene_collection_sync_c)
-VIEW_LAYER_TEST(move_above_below_scene_collection_sync_d)
-VIEW_LAYER_TEST(move_above_below_scene_collection_sync_e)
-VIEW_LAYER_TEST(move_above_below_scene_collection_sync_f)
-VIEW_LAYER_TEST(move_above_below_scene_collection_sync_g)
-VIEW_LAYER_TEST(move_above_below_scene_collection_sync_h)
-VIEW_LAYER_TEST(move_above_below_scene_collection_sync_i)
-VIEW_LAYER_TEST(move_into_scene_collection_a)
-VIEW_LAYER_TEST(move_into_scene_collection_b)
-VIEW_LAYER_TEST(move_into_scene_collection_c)
-VIEW_LAYER_TEST(move_into_scene_collection_d)
-VIEW_LAYER_TEST(move_into_scene_collection_e)
-VIEW_LAYER_TEST(move_into_scene_collection_f)
-VIEW_LAYER_TEST(move_into_scene_collection_g)
-VIEW_LAYER_TEST(move_into_scene_collection_h)
-VIEW_LAYER_TEST(move_into_scene_collection_i)
-VIEW_LAYER_TEST(move_into_scene_collection_j)
-VIEW_LAYER_TEST(move_into_scene_collection_k)
-VIEW_LAYER_TEST(move_into_scene_collection_l)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_a)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_b)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_c)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_d)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_e)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_f)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_g)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_h)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_i)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_j)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_k)
-VIEW_LAYER_TEST(move_into_scene_collection_sync_l)
-VIEW_LAYER_TEST(move_above_below_layer_collection_a)
-VIEW_LAYER_TEST(move_above_below_layer_collection_b)
-VIEW_LAYER_TEST(move_above_below_layer_collection_c)
-VIEW_LAYER_TEST(move_above_below_layer_collection_d)
-VIEW_LAYER_TEST(move_above_below_layer_collection_e)
-VIEW_LAYER_TEST(move_above_below_layer_collection_f)
-VIEW_LAYER_TEST(move_above_below_layer_collection_g)
-VIEW_LAYER_TEST(move_above_below_layer_collection_h)
-VIEW_LAYER_TEST(move_above_below_layer_collection_i)
-VIEW_LAYER_TEST(move_above_below_layer_collection_j)
-VIEW_LAYER_TEST(move_above_below_layer_collection_k)
-VIEW_LAYER_TEST(move_above_below_layer_collection_l)
-VIEW_LAYER_TEST(move_into_layer_collection_a)
-VIEW_LAYER_TEST(move_into_layer_collection_b)
-VIEW_LAYER_TEST(move_into_layer_collection_c)
-VIEW_LAYER_TEST(move_into_layer_collection_d)
-VIEW_LAYER_TEST(move_into_layer_collection_e)
-VIEW_LAYER_TEST(move_into_layer_collection_f)
-VIEW_LAYER_TEST(move_into_layer_collection_g)
-VIEW_LAYER_TEST(move_into_layer_collection_h)
-VIEW_LAYER_TEST(move_into_layer_collection_i)
-VIEW_LAYER_TEST(move_into_layer_collection_j)
-VIEW_LAYER_TEST(layer_linking)
-VIEW_LAYER_TEST(layer_syncing)
-VIEW_LAYER_TEST(scene_collection_delete)
-VIEW_LAYER_TEST(scene_copy_a)
-VIEW_LAYER_TEST(scene_copy_b)
-VIEW_LAYER_TEST(scene_copy_c)
-VIEW_LAYER_TEST(scene_copy_d)
-VIEW_LAYER_TEST(scene_copy_e)
-VIEW_LAYER_TEST(scene_copy_f)
-VIEW_LAYER_TEST(scene_delete)
-VIEW_LAYER_TEST(scene_objects)
-VIEW_LAYER_TEST(scene_write_read)
-VIEW_LAYER_TEST(view_layer_rename)
+view_layer_test(active_collection)
+view_layer_test(background_set)
+view_layer_test(collection_new_sync)
+view_layer_test(collection_rename_a)
+view_layer_test(collection_rename_b)
+# view_layer_test(evaluation_render_settings_a)
+# view_layer_test(evaluation_render_settings_b)
+# view_layer_test(evaluation_render_settings_c)
+# view_layer_test(evaluation_render_settings_d)
+# view_layer_test(evaluation_render_settings_e)
+# view_layer_test(evaluation_render_settings_f)
+# view_layer_test(evaluation_render_settings_g)
+# view_layer_test(evaluation_render_settings_h)
+# view_layer_test(evaluation_render_settings_i)
+view_layer_test(evaluation_visibility_a)
+view_layer_test(evaluation_visibility_b)
+view_layer_test(evaluation_visibility_c)
+view_layer_test(evaluation_visibility_d)
+view_layer_test(evaluation_visibility_e)
+view_layer_test(evaluation_visibility_f)
+view_layer_test(evaluation_visibility_g)
+view_layer_test(evaluation_visibility_h)
+view_layer_test(evaluation_visibility_i)
+view_layer_test(evaluation_visibility_j)
+view_layer_test(evaluation_selectability_a)
+view_layer_test(evaluation_selectability_b)
+view_layer_test(evaluation_selectability_c)
+view_layer_test(evaluation_selectability_d)
+view_layer_test(evaluation_selectability_e)
+view_layer_test(evaluation_selectability_f)
+view_layer_test(group_a)
+view_layer_test(group_b)
+view_layer_test(group_c)
+view_layer_test(group_d)
+view_layer_test(group_e)
+view_layer_test(object_add_cylinder)
+view_layer_test(object_add_empty)
+view_layer_test(object_add_torus)
+view_layer_test(object_add_no_collection_cylinder)
+view_layer_test(object_add_no_collection_empty)
+view_layer_test(object_add_no_collection_torus)
+view_layer_test(object_copy)
+view_layer_test(object_delete_a)
+view_layer_test(object_delete_b)
+view_layer_test(object_link_a)
+view_layer_test(object_link_b)
+view_layer_test(object_link_c)
+view_layer_test(operator_context)
+view_layer_test(make_single_user)
+view_layer_test(move_above_below_scene_collection_a)
+view_layer_test(move_above_below_scene_collection_b)
+view_layer_test(move_above_below_scene_collection_c)
+view_layer_test(move_above_below_scene_collection_d)
+view_layer_test(move_above_below_scene_collection_e)
+view_layer_test(move_above_below_scene_collection_f)
+view_layer_test(move_above_below_scene_collection_g)
+view_layer_test(move_above_below_scene_collection_h)
+view_layer_test(move_above_below_scene_collection_i)
+view_layer_test(move_above_below_scene_collection_sync_a)
+view_layer_test(move_above_below_scene_collection_sync_b)
+view_layer_test(move_above_below_scene_collection_sync_c)
+view_layer_test(move_above_below_scene_collection_sync_d)
+view_layer_test(move_above_below_scene_collection_sync_e)
+view_layer_test(move_above_below_scene_collection_sync_f)
+view_layer_test(move_above_below_scene_collection_sync_g)
+view_layer_test(move_above_below_scene_collection_sync_h)
+view_layer_test(move_above_below_scene_collection_sync_i)
+view_layer_test(move_into_scene_collection_a)
+view_layer_test(move_into_scene_collection_b)
+view_layer_test(move_into_scene_collection_c)
+view_layer_test(move_into_scene_collection_d)
+view_layer_test(move_into_scene_collection_e)
+view_layer_test(move_into_scene_collection_f)
+view_layer_test(move_into_scene_collection_g)
+view_layer_test(move_into_scene_collection_h)
+view_layer_test(move_into_scene_collection_i)
+view_layer_test(move_into_scene_collection_j)
+view_layer_test(move_into_scene_collection_k)
+view_layer_test(move_into_scene_collection_l)
+view_layer_test(move_into_scene_collection_sync_a)
+view_layer_test(move_into_scene_collection_sync_b)
+view_layer_test(move_into_scene_collection_sync_c)
+view_layer_test(move_into_scene_collection_sync_d)
+view_layer_test(move_into_scene_collection_sync_e)
+view_layer_test(move_into_scene_collection_sync_f)
+view_layer_test(move_into_scene_collection_sync_g)
+view_layer_test(move_into_scene_collection_sync_h)
+view_layer_test(move_into_scene_collection_sync_i)
+view_layer_test(move_into_scene_collection_sync_j)
+view_layer_test(move_into_scene_collection_sync_k)
+view_layer_test(move_into_scene_collection_sync_l)
+view_layer_test(move_above_below_layer_collection_a)
+view_layer_test(move_above_below_layer_collection_b)
+view_layer_test(move_above_below_layer_collection_c)
+view_layer_test(move_above_below_layer_collection_d)
+view_layer_test(move_above_below_layer_collection_e)
+view_layer_test(move_above_below_layer_collection_f)
+view_layer_test(move_above_below_layer_collection_g)
+view_layer_test(move_above_below_layer_collection_h)
+view_layer_test(move_above_below_layer_collection_i)
+view_layer_test(move_above_below_layer_collection_j)
+view_layer_test(move_above_below_layer_collection_k)
+view_layer_test(move_above_below_layer_collection_l)
+view_layer_test(move_into_layer_collection_a)
+view_layer_test(move_into_layer_collection_b)
+view_layer_test(move_into_layer_collection_c)
+view_layer_test(move_into_layer_collection_d)
+view_layer_test(move_into_layer_collection_e)
+view_layer_test(move_into_layer_collection_f)
+view_layer_test(move_into_layer_collection_g)
+view_layer_test(move_into_layer_collection_h)
+view_layer_test(move_into_layer_collection_i)
+view_layer_test(move_into_layer_collection_j)
+view_layer_test(layer_linking)
+view_layer_test(layer_syncing)
+view_layer_test(scene_collection_delete)
+view_layer_test(scene_copy_a)
+view_layer_test(scene_copy_b)
+view_layer_test(scene_copy_c)
+view_layer_test(scene_copy_d)
+view_layer_test(scene_copy_e)
+view_layer_test(scene_copy_f)
+view_layer_test(scene_delete)
+view_layer_test(scene_objects)
+view_layer_test(scene_write_read)
+view_layer_test(view_layer_rename)