From 40985de221e77aafe9ba17817cc005b1af8589cc Mon Sep 17 00:00:00 2001
From: Antony Polukhin <antoshkka@gmail.com>
Date: Fri, 18 Nov 2016 22:31:01 +0300
Subject: [PATCH] Update CI scripts and tests

---
 .travis.yml       | 35 ++++++++++++++++-------------------
 test/appveyor.yml |  8 +-------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 63cf3a3..df8be1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,13 @@
 # subject to the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
-# Copyright Antony Polukhin 2014-2015.
+# Copyright Antony Polukhin 2014-2016.
 
 #
 # See https://svn.boost.org/trac/boost/wiki/TravisCoverals for description of this file
 # and how it can be used with Boost libraries.
 #
-# File revision #5
+# File revision #6
 
 sudo: false
 language: cpp
@@ -23,8 +23,7 @@ env:
     global:
         # Autodetect Boost branch by using the following code: - BRANCH_TO_TEST=$TRAVIS_BRANCH
         # or just directly specify it
-        #- BRANCH_TO_TEST=$TRAVIS_BRANCH
-        - BRANCH_TO_TEST=develop
+        - BRANCH_TO_TEST=$TRAVIS_BRANCH
 
         # Files, which coverage results must be ignored (files from other projects).
         # Example: - IGNORE_COVERAGE='*/boost/progress.hpp */filesystem/src/*'
@@ -38,11 +37,12 @@ env:
         - BOOST_REMOVE=$(basename $TRAVIS_BUILD_DIR)
 
     matrix:
-        - CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++98" LINK_FLAGS=--coverage TOOLSET=gcc
-        - CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++11" LINK_FLAGS=--coverage TOOLSET=gcc-5
-        - CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++1y" LINK_FLAGS=--coverage TOOLSET=gcc-5
-        #- CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++11 -stdlib=libc++" LINK_FLAGS="--coverage -stdlib=libc++" TOOLSET=clang
-        #- CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++1y -stdlib=libc++" LINK_FLAGS="--coverage -stdlib=libc++" TOOLSET=clang
+        # Note that "--coverage -fsanitize=address,leak,undefined -DBOOST_TRAVISCI_BUILD" are added automatically lower in code
+        - CXX_FLAGS="-std=c++98" LINK_FLAGS="" TOOLSET=gcc-6
+        - CXX_FLAGS="-std=c++11" LINK_FLAGS="" TOOLSET=gcc-6
+        - CXX_FLAGS="-std=c++1y" LINK_FLAGS="" TOOLSET=gcc-6
+        #- CXX_FLAGS="-std=c++11 -stdlib=libc++" LINK_FLAGS="-stdlib=libc++" TOOLSET=clang
+        #- CXX_FLAGS="-std=c++1y -stdlib=libc++" LINK_FLAGS="-stdlib=libc++" TOOLSET=clang
 
 ###############################################################################################################
 # From this point and below code is same for all the Boost libs
@@ -54,11 +54,12 @@ addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
+    - git-core
     packages:
-    - valgrind
+    - git
     - python-yaml
-    - gcc-5
-    - g++-5
+    - gcc-6
+    - g++-6
     - lcov
     - clang
     - libc++-dev
@@ -74,13 +75,9 @@ before_install:
     - git remote add --no-tags -t $BRANCH_TO_TEST origin https://github.com/boostorg/boost.git
     - git fetch --depth=1
     - git checkout $BRANCH_TO_TEST
-    - git submodule update --init --merge
+    - git submodule update --jobs=3 --init --merge
     - git remote set-branches --add origin $BRANCH_TO_TEST
     - git pull --recurse-submodules
-    - git submodule update --init
-    - git checkout $BRANCH_TO_TEST
-    - git submodule foreach "git reset --quiet --hard; git clean -fxd"
-    - git reset --hard; git clean -fxd
     - git status
     - rm -rf $BOOST/libs/$BOOST_REMOVE
     - mv $TRAVIS_BUILD_DIR $BOOST/libs/$PROJECT_TO_TEST
@@ -91,8 +88,8 @@ before_install:
 
 script:
     # `--coverage` flags required to generate coverage info for Coveralls
-    - ../../../b2 testing.launcher=valgrind address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="$CXX_FLAGS" linkflags="$LINK_FLAGS"
-
+    - ../../../b2 "testing.launcher=LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.3 " address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="--coverage -fsanitize=address,leak,undefined -DBOOST_TRAVISCI_BUILD $CXX_FLAGS" linkflags="$LINK_FLAGS --coverage -lasan -lubsan"
+    
 after_success:
     # Copying Coveralls data to a separate folder
     - mkdir -p $TRAVIS_BUILD_DIR/coverals
diff --git a/test/appveyor.yml b/test/appveyor.yml
index 6e33f4d..661587f 100644
--- a/test/appveyor.yml
+++ b/test/appveyor.yml
@@ -8,7 +8,7 @@
 # See https://svn.boost.org/trac/boost/wiki/TravisCoverals for description of this file
 # and how it can be used with Boost libraries.
 #
-# File revision #1
+# File revision #2
 
 init:
     - set BRANCH_TO_TEST=%APPVEYOR_REPO_BRANCH%
@@ -45,12 +45,6 @@ before_build:
     - git submodule update --init --merge
     - git remote set-branches --add origin %BRANCH_TO_TEST%
     - git pull --recurse-submodules
-    - git submodule update --init
-    - git checkout %BRANCH_TO_TEST%
-    #- git submodule foreach "git reset --quiet --hard"
-    #- git submodule foreach "git clean -fxd"
-    - git reset --hard
-    - git clean -fxd
     - git status
     - rm -rf %BOOST%/libs/%BOOST_REMOVE%
     - mv %APPVEYOR_BUILD_FOLDER% %BOOST%/libs/%PROJECT_TO_TEST%