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 <ideasman42@gmail.com>2019-10-28 17:32:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-10-28 17:33:44 +0300
commit312075e6883986fe2d1861811c7255b8898ab2cc (patch)
tree78e19f58559cef4f5da81ff8a95439b16f7fc510 /tests
parent74c9a4769ebe028560f071254a010858eef57fa8 (diff)
CMake: add missing headers, use space before comments
Diffstat (limited to 'tests')
-rw-r--r--tests/python/CMakeLists.txt6
-rw-r--r--tests/python/collada/CMakeLists.txt11
-rw-r--r--tests/python/view_layer/CMakeLists.txt24
3 files changed, 21 insertions, 20 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 2c9f91cca8e..3036be71564 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -28,9 +28,9 @@ set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
file(MAKE_DIRECTORY ${TEST_OUT_DIR})
file(MAKE_DIRECTORY ${TEST_OUT_DIR}/io_tests)
-#~ if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
-#~ message(FATAL_ERROR "CMake test directory not found!")
-#~ endif()
+# if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
+# message(FATAL_ERROR "CMake test directory not found!")
+# endif()
# Run Blender command with parameters.
function(add_blender_test testname)
diff --git a/tests/python/collada/CMakeLists.txt b/tests/python/collada/CMakeLists.txt
index 13d2b4fd9ff..1e09b65b880 100644
--- a/tests/python/collada/CMakeLists.txt
+++ b/tests/python/collada/CMakeLists.txt
@@ -29,9 +29,9 @@ set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
# ugh, any better way to do this on testing only?
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR})
-#~ if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
-#~ message(FATAL_ERROR "CMake test directory not found!")
-#~ endif()
+# if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
+# message(FATAL_ERROR "CMake test directory not found!")
+# endif()
# all calls to blender use this
if(APPLE)
@@ -61,5 +61,6 @@ 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 cca3cd22b67..3f38ee4675f 100644
--- a/tests/python/view_layer/CMakeLists.txt
+++ b/tests/python/view_layer/CMakeLists.txt
@@ -25,9 +25,9 @@ set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
# ugh, any better way to do this on testing only?
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR})
-#~ if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
-#~ message(FATAL_ERROR "CMake test directory not found!")
-#~ endif()
+# if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
+# message(FATAL_ERROR "CMake test directory not found!")
+# endif()
# for testing with valgrind prefix: valgrind --track-origins=yes --error-limit=no
set(TEST_BLENDER_EXE $<TARGET_FILE:blender> --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
@@ -51,15 +51,15 @@ 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_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)