From f1726cef0d59f7dc6ad833eb95ef1fc2a98141f5 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sun, 12 Aug 2018 17:02:17 +0900 Subject: [PATCH] Updated travis-ci environment. --- .travis.yml | 71 +++++++++++++++++++----------------------- ci/build_regression.sh | 2 +- test/msgpack_cpp17.cpp | 5 +++ 3 files changed, 38 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7dc6d902..70068371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,8 @@ install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./cmake-3.7.1-Linux-x86_64.sh --prefix=${BASE}/usr --skip-license; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH="${BASE}/usr/bin:$PATH"; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export LD_LIBRARY_PATH="${BASE}/usr/lib:$LD_LIBRARY_PATH"; fi - - if [ "$CXX" == "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi - - if [ "$CXX" == "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$MSGPACK_FUZZ_REGRESSION" != "ON" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi - - if [ "$CXX" == "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$MSGPACK_FUZZ_REGRESSION" == "ON" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi + - if [ "$CXX" == "g++" ]; then export CXX="g++-7" CC="gcc-7"; fi + - if [ "$CXX" == "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi - if [ "$CXX" == "g++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then cd /usr/include/c++/$(g++ -v 2>&1 | grep version | awk '{print $3}')/bits; ln -s ../ext/atomicity.h .; cd ${BASE}/usr; fi #gtest - wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip @@ -30,8 +29,8 @@ install: # valgrind - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$MSGPACK_FUZZ_REGRESSION" != "ON" ]; then wget http://valgrind.org/downloads/valgrind-3.12.0.tar.bz2 && tar xjf valgrind-3.12.0.tar.bz2 && cd valgrind-3.12.0 && ./configure --prefix=${BASE}/usr > /dev/null && make -j3 > /dev/null && make install > /dev/null && cd ..; fi # boost - - if [ "$BOOST" == "ON" ] && [ "MSGPACK_FUZZ_REGRESSION" != "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.zip && unzip -q boost_1_66_0.zip && cd boost_1_66_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi - - if [ "$MSGPACK_FUZZ_REGRESSION" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.zip && unzip -q boost_1_66_0.zip && cd boost_1_66_0 && ./bootstrap.sh --with-toolset=clang && ./b2 clean && ./b2 -j$(nproc) --prefix=${BASE}/usr --with-system --with-filesystem address-model=${ARCH} install > /dev/null && cd ..; fi + - if [ "$BOOST" == "ON" ] && [ "MSGPACK_FUZZ_REGRESSION" != "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.zip && unzip -q boost_1_67_0.zip && cd boost_1_67_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi + - if [ "$MSGPACK_FUZZ_REGRESSION" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.zip && unzip -q boost_1_67_0.zip && cd boost_1_67_0 && ./bootstrap.sh --with-toolset=clang && ./b2 clean && ./b2 -j$(nproc) --prefix=${BASE}/usr --with-system --with-filesystem address-model=${ARCH} install > /dev/null && cd ..; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi matrix: @@ -55,15 +54,14 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - - llvm-toolchain-precise + - llvm-toolchain-trusty-5.0 packages: - g++-multilib - gcc-multilib - - gcc-5-multilib - - g++-5-multilib + - gcc-7-multilib + - g++-7-multilib - bzip2 - - clang-3.9 + - clang-5.0 - libc6-dbg - os: linux compiler: clang @@ -72,20 +70,19 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - - llvm-toolchain-precise + - llvm-toolchain-trusty-5.0 packages: - g++-multilib - gcc-multilib - - gcc-5-multilib - - g++-5-multilib + - gcc-7-multilib + - g++-7-multilib - lib32stdc++6-6-dbg - lib32gcc1 - libc6-i386 - lib32z1-dev - zlib1g-dev - bzip2 - - clang-3.9 + - clang-5.0 - libc6-dbg - os: linux compiler: clang @@ -94,15 +91,14 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - - llvm-toolchain-precise + - llvm-toolchain-trusty-5.0 packages: - g++-multilib - gcc-multilib - - gcc-5-multilib - - g++-5-multilib + - gcc-7-multilib + - g++-7-multilib - bzip2 - - clang-3.9 + - clang-5.0 - libc6-dbg - os: linux compiler: clang @@ -111,20 +107,19 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - - llvm-toolchain-precise + - llvm-toolchain-trusty-5.0 packages: - g++-multilib - gcc-multilib - - gcc-5-multilib - - g++-5-multilib + - gcc-7-multilib + - g++-7-multilib - lib32stdc++6-6-dbg - lib32gcc1 - libc6-i386 - lib32z1-dev - zlib1g-dev - bzip2 - - clang-3.9 + - clang-5.0 - libc6-dbg - os: linux compiler: gcc @@ -136,8 +131,8 @@ matrix: packages: - g++-multilib - gcc-multilib - - gcc-6-multilib - - g++-6-multilib + - gcc-7-multilib + - g++-7-multilib - bzip2 - libc6-dbg - os: linux @@ -150,8 +145,8 @@ matrix: packages: - g++-multilib - gcc-multilib - - gcc-6-multilib - - g++-6-multilib + - gcc-7-multilib + - g++-7-multilib - lib32stdc++6-6-dbg - lib32gcc1 - libc6-i386 @@ -169,8 +164,8 @@ matrix: packages: - g++-multilib - gcc-multilib - - gcc-6-multilib - - g++-6-multilib + - gcc-7-multilib + - g++-7-multilib - bzip2 - libc6-dbg - os: linux @@ -183,8 +178,8 @@ matrix: packages: - g++-multilib - gcc-multilib - - gcc-6-multilib - - g++-6-multilib + - gcc-7-multilib + - g++-7-multilib - lib32stdc++6-6-dbg - lib32gcc1 - libc6-i386 @@ -202,8 +197,8 @@ matrix: packages: - g++-multilib - gcc-multilib - - gcc-6-multilib - - g++-6-multilib + - gcc-7-multilib + - g++-7-multilib - lib32stdc++6-6-dbg - lib32gcc1 - libc6-i386 @@ -218,8 +213,7 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - - llvm-toolchain-precise + - llvm-toolchain-trusty-5.0 packages: - bzip2 - clang-5.0 @@ -232,8 +226,7 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - - llvm-toolchain-precise + - llvm-toolchain-trusty-5.0 packages: - bzip2 - clang-5.0 diff --git a/ci/build_regression.sh b/ci/build_regression.sh index fca09afd..1cd3f175 100755 --- a/ci/build_regression.sh +++ b/ci/build_regression.sh @@ -22,7 +22,7 @@ then exit 1 fi -cmake -DMSGPACK_FUZZ_REGRESSION="ON" -DMSGPACK_CXX17="ON" -DMSGPACK_BOOST=${BOOST} -DMSGPACK_SAN=${MSGPACK_SAN} -v .. +cmake -DMSGPACK_FUZZ_REGRESSION="ON" -DMSGPACK_CXX11="ON" -DMSGPACK_BOOST=${BOOST} -DMSGPACK_SAN=${MSGPACK_SAN} -v .. ret=$? if [ $ret -ne 0 ] diff --git a/test/msgpack_cpp17.cpp b/test/msgpack_cpp17.cpp index 36fa82b8..fe4649c9 100644 --- a/test/msgpack_cpp17.cpp +++ b/test/msgpack_cpp17.cpp @@ -6,6 +6,11 @@ #include "config.h" #endif +// To avoid link error +TEST(MSGPACK_CPP17, dummy) +{ +} + #if !defined(MSGPACK_USE_CPP03) && __cplusplus >= 201703 // C++17