From 9fd7e4adeec910fc69d5a0c682451b9c8926047a Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Wed, 9 Aug 2017 18:06:35 -0700 Subject: [PATCH] tools/ renamed from build/ --- .travis.yml | 3 +-- CHANGELOG.md | 1 + CMakeLists.txt | 2 +- Jamfile | 2 +- {build => tools}/blacklist.supp | 0 {build => tools}/build-and-test.sh | 2 +- {build => tools}/field.txt | 0 {build => tools}/install-dependencies.sh | 0 {build => tools}/local-travis.sh | 0 {build => tools}/make_field.sh | 0 {build => tools}/valgrind.supp | 0 11 files changed, 5 insertions(+), 5 deletions(-) rename {build => tools}/blacklist.supp (100%) rename {build => tools}/build-and-test.sh (98%) rename {build => tools}/field.txt (100%) rename {build => tools}/install-dependencies.sh (100%) rename {build => tools}/local-travis.sh (100%) rename {build => tools}/make_field.sh (100%) rename {build => tools}/valgrind.supp (100%) diff --git a/.travis.yml b/.travis.yml index ee470fdf..5c5af7c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -109,7 +109,6 @@ matrix: # OSX before_install: &base_before_install - #- build/install-dependencies.sh - pip install --user https://github.com/codecov/codecov-python/archive/master.zip install: @@ -188,7 +187,7 @@ script: - |- echo "using $TOOLSET : : $COMPILER : -std=$CXXSTD ;" > ~/user-config.jam - cd ../boost-root - - travis_retry libs/beast/build/build-and-test.sh + - travis_retry libs/beast/tools/build-and-test.sh after_script: - cat nohup.out || echo "nohup.out already deleted" diff --git a/CHANGELOG.md b/CHANGELOG.md index a1b85240..6a105604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Version 104: * Only set -std=c++11 on Travis * Only set /permissive- on Appveyor * Tidy up some test warnings +* tools/ renamed from build/ -------------------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index b7b92143..0c9a60ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,7 +150,7 @@ elseif ("${VARIANT}" STREQUAL "ubasan") else() set (CMAKE_BUILD_TYPE RELWITHDEBINFO) 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") endif() diff --git a/Jamfile b/Jamfile index 51c45bf1..c993e919 100644 --- a/Jamfile +++ b/Jamfile @@ -68,7 +68,7 @@ variant ubasan : release : - "-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=libs/beast/build/blacklist.supp" + "-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp" "-fsanitize=address,undefined" BOOST_USE_ASAN=1 ; diff --git a/build/blacklist.supp b/tools/blacklist.supp similarity index 100% rename from build/blacklist.supp rename to tools/blacklist.supp diff --git a/build/build-and-test.sh b/tools/build-and-test.sh similarity index 98% rename from build/build-and-test.sh rename to tools/build-and-test.sh index 884f1883..0e0d955f 100755 --- a/build/build-and-test.sh +++ b/tools/build-and-test.sh @@ -60,7 +60,7 @@ function valgrind_run () valgrind \ --track-origins=yes \ --max-stackframe=16000000 \ - --suppressions=$BOOST_ROOT/libs/beast/build/valgrind.supp \ + --suppressions=$BOOST_ROOT/libs/beast/tools/valgrind.supp \ --error-exitcode=1 \ $@ } diff --git a/build/field.txt b/tools/field.txt similarity index 100% rename from build/field.txt rename to tools/field.txt diff --git a/build/install-dependencies.sh b/tools/install-dependencies.sh similarity index 100% rename from build/install-dependencies.sh rename to tools/install-dependencies.sh diff --git a/build/local-travis.sh b/tools/local-travis.sh similarity index 100% rename from build/local-travis.sh rename to tools/local-travis.sh diff --git a/build/make_field.sh b/tools/make_field.sh similarity index 100% rename from build/make_field.sh rename to tools/make_field.sh diff --git a/build/valgrind.supp b/tools/valgrind.supp similarity index 100% rename from build/valgrind.supp rename to tools/valgrind.supp