Protect resources from different processes using CMake instance trying to write to SCM by locking & releasing examples_tests and zlib directory. Perform tests executing all axes at once with docker. TODO: we could make atomic lock guard per file, though directory is fine as a solution - implement CMake NBL_CONFIGURE_FILE_ATOMIC(*) and NBL_FILE_ATOMIC(*) in future

Author: AnastaZIuk

3rdparty/CMakeLists.txt

@@ -62,9 +62,15 @@ set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 set(_OLD_SKIP_INSTALL_ALL ${SKIP_INSTALL_ALL})
 set(BUILD_SHARED_LIBS OFF)
 set(SKIP_INSTALL_ALL ON)
+
 add_subdirectory(zlib zlib EXCLUDE_FROM_ALL)
-execute_process(COMMAND ${CMAKE_COMMAND} -E rename zconf.h.included zconf.h 
-		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/zlib") # clean zlib git working-tree
+file(LOCK "${CMAKE_CURRENT_SOURCE_DIR}/zlib" DIRECTORY GUARD PROCESS RESULT_VARIABLE NBL_LOCK TIMEOUT 60)
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.included")
+	execute_process(COMMAND "${CMAKE_COMMAND}" -E rename zconf.h.included zconf.h 
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/zlib"
+	) # clean zlib git working-tree
+endif()
+file(LOCK "${CMAKE_CURRENT_SOURCE_DIR}/zlib" DIRECTORY RELEASE RESULT_VARIABLE NBL_LOCK)
 set(SKIP_INSTALL_ALL ${_OLD_SKIP_INSTALL_ALL})
 set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
 

CMakeLists.txt

@@ -347,7 +347,9 @@ add_subdirectory(src/nbl)
 add_subdirectory("${NBL_PYTHON_MODULE_ROOT_PATH}" tests) # Python Framework
 
 if(NBL_BUILD_EXAMPLES)
+	file(LOCK "${CMAKE_CURRENT_SOURCE_DIR}/examples_tests" DIRECTORY GUARD PROCESS RESULT_VARIABLE NBL_LOCK TIMEOUT 60)
 	add_subdirectory(examples_tests)
+	file(LOCK "${CMAKE_CURRENT_SOURCE_DIR}/examples_tests" DIRECTORY RELEASE RESULT_VARIABLE NBL_LOCK)
 endif()
 
 if(NBL_BUILD_DOCS)