tools/ renamed from build/

This commit is contained in:
Vinnie Falco
2017-08-09 18:06:35 -07:00
parent d8a1eef7a3
commit 9fd7e4adee
11 changed files with 5 additions and 5 deletions

View File

@ -109,7 +109,6 @@ matrix:
# OSX # OSX
before_install: &base_before_install before_install: &base_before_install
#- build/install-dependencies.sh
- pip install --user https://github.com/codecov/codecov-python/archive/master.zip - pip install --user https://github.com/codecov/codecov-python/archive/master.zip
install: install:
@ -188,7 +187,7 @@ script:
- |- - |-
echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD ;" > ~/user-config.jam echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD ;" > ~/user-config.jam
- cd ../boost-root - cd ../boost-root
- travis_retry libs/beast/build/build-and-test.sh - travis_retry libs/beast/tools/build-and-test.sh
after_script: after_script:
- cat nohup.out || echo "nohup.out already deleted" - cat nohup.out || echo "nohup.out already deleted"

View File

@ -5,6 +5,7 @@ Version 104:
* Only set -std=c++11 on Travis * Only set -std=c++11 on Travis
* Only set /permissive- on Appveyor * Only set /permissive- on Appveyor
* Tidy up some test warnings * Tidy up some test warnings
* tools/ renamed from build/
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

View File

@ -150,7 +150,7 @@ elseif ("${VARIANT}" STREQUAL "ubasan")
else() else()
set (CMAKE_BUILD_TYPE RELWITHDEBINFO) set (CMAKE_BUILD_TYPE RELWITHDEBINFO)
set (CMAKE_CXX_FLAGS set (CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -DBOOST_BEAST_NO_SLOW_TESTS=1 -msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/build/blacklist.supp") "${CMAKE_CXX_FLAGS} -DBOOST_BEAST_NO_SLOW_TESTS=1 -msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tools/blacklist.supp")
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined") set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined")
endif() endif()

View File

@ -68,7 +68,7 @@ variant ubasan
: :
release release
: :
<cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=libs/beast/build/blacklist.supp" <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
<linkflags>"-fsanitize=address,undefined" <linkflags>"-fsanitize=address,undefined"
<define>BOOST_USE_ASAN=1 <define>BOOST_USE_ASAN=1
; ;

View File

@ -60,7 +60,7 @@ function valgrind_run ()
valgrind \ valgrind \
--track-origins=yes \ --track-origins=yes \
--max-stackframe=16000000 \ --max-stackframe=16000000 \
--suppressions=$BOOST_ROOT/libs/beast/build/valgrind.supp \ --suppressions=$BOOST_ROOT/libs/beast/tools/valgrind.supp \
--error-exitcode=1 \ --error-exitcode=1 \
$@ $@
} }