enable shared boost for tests (#2783)

use static boost for windows tests due to strange linking error
enable multi-core build support for b2
This commit is contained in:
Russel Waters 2020-05-22 09:51:21 -04:00 committed by GitHub
commit d593bdcfc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 3 deletions

View file

@ -9,6 +9,7 @@ if (${env:artifact} -eq 1) {
$env:NETWORK_CFG = "live"
$env:BUILD_TYPE = "Release"
}
$env:NANO_SHARED_BOOST = "OFF"
$env:ROCKS_LIB = '-DROCKSDB_LIBRARIES="c:\vcpkg\installed\x64-windows-static\lib\rocksdb.lib"'
$env:NANO_TEST = "-DNANO_TEST=OFF"
$env:TRAVIS_TAG = ${env:TAG}
@ -25,6 +26,7 @@ else {
$env:BUILD_TYPE = "Debug"
$env:ROCKS_LIB = '-DROCKSDB_LIBRARIES="c:\vcpkg\installed\x64-windows-static\debug\lib\rocksdbd.lib"'
}
$env:NANO_SHARED_BOOST = "OFF"
$env:NETWORK_CFG = "test"
$env:NANO_TEST = "-DNANO_TEST=ON"
$env:CI = '-DCI_TEST="1"'

View file

@ -21,7 +21,8 @@ cmake .. ^
-DNANO_SIMD_OPTIMIZATIONS=TRUE ^
-Dgtest_force_shared_crt=on ^
-DBoost_NO_SYSTEM_PATHS=TRUE ^
-DBoost_NO_BOOST_CMAKE=TRUE
-DBoost_NO_BOOST_CMAKE=TRUE ^
-DNANO_SHARED_BOOST=%NANO_SHARED_BOOST%
set exit_code=%errorlevel%
if %exit_code% neq 0 goto exit

View file

@ -72,6 +72,7 @@ cmake \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DBOOST_ROOT=/tmp/boost/ \
-DNANO_SHARED_BOOST=ON \
-DQt5_DIR=${qt_dir} \
-DCI_TEST="1" \
${BACKTRACE} \

View file

@ -21,4 +21,4 @@ RUN ./fetch_boost.sh
# BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE
# see https://www.boost.org/doc/libs/1_70_0/doc/html/stacktrace/configuration_and_build.html#stacktrace.configuration_and_build.f3
RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/5/include/backtrace.h /tmp/backtrace.h
RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/5/include/backtrace.h /tmp/backtrace.h

View file

@ -20,3 +20,9 @@ ENV BOOST_ROOT=/tmp/boost
ADD util/build_prep/fetch_boost.sh fetch_boost.sh
RUN COMPILER=clang-6 ./fetch_boost.sh
# workaround to get a path that can be easily passed into cmake for
# BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE
# see https://www.boost.org/doc/libs/1_70_0/doc/html/stacktrace/configuration_and_build.html#stacktrace.configuration_and_build.f3
RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/5/include/backtrace.h /tmp/backtrace.h

View file

@ -7,6 +7,6 @@ RUN ./fetch_rocksdb.sh
ENV BOOST_ROOT=/tmp/boost
ADD util/build_prep/fetch_boost.sh fetch_boost.sh
ADD util/build_prep/bootstrap_boost.sh bootstrap_boost.sh
RUN COMPILER=gcc ./fetch_boost.sh