Skip to content

Commit

Permalink
gitlab-ci: add out-of-source build
Browse files Browse the repository at this point in the history
Implemented out-of-source build at cmake files.
Added out of source build make targets and added
test job to gitlab-ci.

Closes #4874
  • Loading branch information
avtikhon committed Sep 23, 2020
1 parent e4d3ef9 commit 3790b1b
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .gitlab-ci.yml
Expand Up @@ -145,6 +145,13 @@ luacheck:

# Tests

out_of_source:
stage: test
tags:
- deploy_test
script:
- ${GITLAB_MAKE} test_oos_build

release:
<<: *docker_test_definition
script:
Expand Down
26 changes: 25 additions & 1 deletion .travis.mk
Expand Up @@ -7,7 +7,9 @@ DOCKER_IMAGE_TARANTOOL="registry.gitlab.com/tarantool/tarantool/testing/debian-s
TEST_RUN_EXTRA_PARAMS?=
MAX_FILES?=65534
MAX_PROC?=2500
OOS_SRC_PATH="/source"
OOS_SRC_PATH?="/source"
OOS_BUILD_PATH?="/rw_bins"
OOS_BUILD_RULE?=test_oos_no_deps
BIN_DIR=/usr/local/bin

CLOJURE_URL="https://download.clojure.org/install/linux-install-1.10.1.561.sh"
Expand Down Expand Up @@ -199,6 +201,28 @@ test_debian_install_luacheck:
test_debian_luacheck: test_debian_install_luacheck configure_debian
make luacheck

# 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 && \
${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_IMAGE_TARANTOOL} \
make -f .travis.mk ${OOS_BUILD_RULE}

#######
# OSX #
#######
Expand Down
4 changes: 2 additions & 2 deletions cmake/utils.cmake
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions src/box/CMakeLists.txt
Expand Up @@ -77,6 +77,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 bit)
Expand Down

0 comments on commit 3790b1b

Please sign in to comment.