mirror of
https://github.com/boostorg/beast.git
synced 2025-08-02 14:24:31 +02:00
bjam variant names are global
This commit is contained in:
@@ -39,7 +39,7 @@ matrix:
|
||||
- os: linux
|
||||
compiler: g++-6
|
||||
env:
|
||||
- VARIANT=coverage
|
||||
- VARIANT=beast_coverage
|
||||
- TOOLSET=gcc
|
||||
- COMPILER=g++-6
|
||||
- CXXSTD=11
|
||||
@@ -59,7 +59,7 @@ matrix:
|
||||
- os: linux
|
||||
compiler: g++-5
|
||||
env:
|
||||
- VARIANT=valgrind
|
||||
- VARIANT=beast_valgrind
|
||||
- TOOLSET=gcc
|
||||
- COMPILER=g++-5
|
||||
- CXXSTD=11
|
||||
@@ -77,7 +77,7 @@ matrix:
|
||||
- os: linux
|
||||
compiler: clang++-3.8
|
||||
env:
|
||||
- VARIANT=ubasan
|
||||
- VARIANT=beast_ubasan
|
||||
- TOOLSET=clang
|
||||
- COMPILER=clang++-3.8
|
||||
- CXXSTD=11
|
||||
|
6
Jamfile
6
Jamfile
@@ -31,18 +31,18 @@ lib crypt32 ;
|
||||
lib ssl : : <target-os>windows <name>ssleay32 ;
|
||||
lib crypto : : <target-os>windows <name>libeay32 ;
|
||||
|
||||
variant coverage
|
||||
variant beast_coverage
|
||||
: debug
|
||||
: <cxxflags>"-msse4.2 --coverage"
|
||||
<linkflags>"--coverage"
|
||||
;
|
||||
|
||||
variant valgrind
|
||||
variant beast_valgrind
|
||||
: release
|
||||
: <valgrind>on # Boost.Context uses this property
|
||||
;
|
||||
|
||||
variant ubasan
|
||||
variant beast_ubasan
|
||||
: release
|
||||
: <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
|
||||
<linkflags>"-fsanitize=address,undefined"
|
||||
|
@@ -99,9 +99,9 @@ INC_DIR="$BOOST_ROOT/boost/beast"
|
||||
|
||||
function build_bjam ()
|
||||
{
|
||||
if [[ $VARIANT == "coverage" ]] || \
|
||||
[[ $VARIANT == "valgrind" ]] || \
|
||||
[[ $VARIANT == "ubasan" ]]; then
|
||||
if [[ $VARIANT == "beast_coverage" ]] || \
|
||||
[[ $VARIANT == "beast_valgrind" ]] || \
|
||||
[[ $VARIANT == "beast_ubasan" ]]; then
|
||||
b2 \
|
||||
define=BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 \
|
||||
cxxstd=$CXXSTD \
|
||||
@@ -126,7 +126,7 @@ function build_bjam ()
|
||||
|
||||
build_bjam
|
||||
|
||||
if [[ $VARIANT == "coverage" ]]; then
|
||||
if [[ $VARIANT == "beast_coverage" ]]; then
|
||||
# for lcov to work effectively, the paths and includes
|
||||
# passed to the compiler should not contain "." or "..".
|
||||
# (this runs in $BOOST_ROOT)
|
||||
@@ -143,7 +143,7 @@ if [[ $VARIANT == "coverage" ]]; then
|
||||
~/.local/bin/codecov -X gcov -f lcov.info
|
||||
find "$BOOST_ROOT" -name "*.gcda" | xargs rm -f
|
||||
|
||||
elif [[ $VARIANT == "valgrind" ]]; then
|
||||
elif [[ $VARIANT == "beast_valgrind" ]]; then
|
||||
run_tests_with_valgrind "$BIN_DIR" fat-tests
|
||||
|
||||
else
|
||||
|
Reference in New Issue
Block a user