From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp16.mail.ru (smtp16.mail.ru [94.100.176.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id E57B7469711 for ; Tue, 26 May 2020 17:42:48 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Tue, 26 May 2020 17:42:38 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v2 7/7] gitlab-ci: add out-of-source build List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Oleg Piskunov , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org, Alexander Turenko Implemented out-of-source build at cmake files. Added out of source build make targets and added test job to gitlab-ci. Closes #4874 --- .gitlab-ci.yml | 7 +++++++ .travis.mk | 26 ++++++++++++++++++++++++++ cmake/utils.cmake | 4 ++-- src/box/CMakeLists.txt | 1 + 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 256b368c4..d05c80692 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,6 +105,13 @@ variables: # Tests +out_of_source: + stage: test + tags: + - deploy_test + script: + - ${GITLAB_MAKE} test_oos_build + release: <<: *docker_test_definition script: diff --git a/.travis.mk b/.travis.mk index 063537f25..a7717c92a 100644 --- a/.travis.mk +++ b/.travis.mk @@ -3,9 +3,13 @@ # DOCKER_IMAGE?=packpack/packpack:debian-stretch +DOCKER_TEST_IMAGE?=registry.gitlab.com/tarantool/tarantool/testing/debian-stretch:latest TEST_RUN_EXTRA_PARAMS?= MAX_FILES?=65534 MAX_PROC?=2500 +OOS_SRC_PATH?=/source +OOS_BUILD_PATH?=/rw_bins +OOS_BUILD_RULE?=test_oos_no_deps all: package @@ -146,6 +150,28 @@ test_static_build: deps_debian_static test_static_docker_build: docker build --no-cache --network=host --build-arg RUN_TESTS=ON -f Dockerfile.staticbuild . +# Out-Of-Source build + +build_oos: + mkdir ${OOS_BUILD_PATH} 2>/dev/null || : ; \ + cd ${OOS_BUILD_PATH} && \ + cmake ${OOS_SRC_PATH} ${CMAKE_EXTRA_PARAMS} && \ + make -j + +test_oos_no_deps: build_oos + cd ${OOS_BUILD_PATH}/test && \ + OUTOFSRC_BUILD=ON ${OOS_SRC_PATH}/test/test-run.py \ + --builddir ${OOS_BUILD_PATH} \ + --vardir ${OOS_BUILD_PATH}/test/var --force + +test_oos: deps_debian test_oos_no_deps + +test_oos_build: + docker run --network=host -w ${OOS_SRC_PATH} \ + --mount type=bind,source="${PWD}",target=${OOS_SRC_PATH},readonly,bind-propagation=rslave \ + -i ${DOCKER_TEST_IMAGE} \ + make -f .travis.mk ${OOS_BUILD_RULE} + ####### # OSX # ####### diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 3ab2d3ff2..eaec821b3 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -70,9 +70,9 @@ endfunction() function(bin_source varname srcfile dstfile) set(var ${${varname}}) - set(${varname} ${var} ${dstfile} PARENT_SCOPE) set (srcfile "${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}") - set (dstfile "${CMAKE_CURRENT_SOURCE_DIR}/${dstfile}") + set (dstfile "${CMAKE_CURRENT_BINARY_DIR}/${dstfile}") + set(${varname} ${var} "${dstfile}" PARENT_SCOPE) set (tmpfile "${dstfile}.tmp") get_filename_component(module ${dstfile} NAME_WE) diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt index 7dc94d893..feec2de01 100644 --- a/src/box/CMakeLists.txt +++ b/src/box/CMakeLists.txt @@ -32,6 +32,7 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${lua_sources}) include_directories(${ZSTD_INCLUDE_DIRS}) include_directories(${CMAKE_BINARY_DIR}/src/box/sql) +include_directories(${CMAKE_BINARY_DIR}/src/box) add_library(vclock STATIC vclock.c) target_link_libraries(vclock core) -- 2.17.1