From e09b355575cd9f7dac7347c986a54a33a443291d Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Wed, 7 Feb 2018 17:01:29 +0000 Subject: [PATCH] [travis] upgrade to clang 5.0 (#2544) --- .travis.yml | 27 +++++++++++++++++++++------ .travis/script.sh | 2 +- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b3234148..4e73ae1f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,9 +42,14 @@ after_success: matrix: include: - - env: BUILD_TARGET="posix-distcheck" VERBOSE=1 VIRTUAL_TIME=1 + - env: BUILD_TARGET="posix-distcheck" CC=clang-5.0 CXX=clang++-5.0 VERBOSE=1 VIRTUAL_TIME=1 os: linux - compiler: clang + addons: + apt: + sources: + - llvm-toolchain-trusty-5.0 + packages: + - clang-5.0 - env: BUILD_TARGET="posix-32-bit" VERBOSE=1 VIRTUAL_TIME=1 os: linux compiler: gcc @@ -56,9 +61,14 @@ matrix: compiler: gcc - env: BUILD_TARGET="pretty-check" os: linux - - env: BUILD_TARGET="scan-build" CC="clang" CXX="clang++" + - env: BUILD_TARGET="scan-build" CC=clang-5.0 CXX=clang++-5.0 os: linux - compiler: clang + addons: + apt: + sources: + - llvm-toolchain-trusty-5.0 + packages: + - clang-5.0 - env: BUILD_TARGET="arm-gcc49" os: linux compiler: gcc @@ -68,9 +78,14 @@ matrix: - env: BUILD_TARGET="arm-gcc63" os: linux compiler: gcc - - env: BUILD_TARGET="posix" CC="clang" CXX="clang++" + - env: BUILD_TARGET="posix" CC=clang-5.0 CXX=clang++-5.0 os: linux - compiler: clang + addons: + apt: + sources: + - llvm-toolchain-trusty-5.0 + packages: + - clang-5.0 - env: BUILD_TARGET="posix" CC="gcc" CXX="g++" os: linux compiler: gcc diff --git a/.travis/script.sh b/.travis/script.sh index 82a4da5dd..d567af21d 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -344,7 +344,7 @@ set -x } [ $BUILD_TARGET != posix-distcheck ] || { - export ASAN_SYMBOLIZER_PATH=`which llvm-symbolizer-3.4` || die + export ASAN_SYMBOLIZER_PATH=`which llvm-symbolizer-5.0` || die export ASAN_OPTIONS=symbolize=1 || die export DISTCHECK_CONFIGURE_FLAGS= CPPFLAGS=-DOPENTHREAD_POSIX_VIRTUAL_TIME=1 || die ./bootstrap || die