Enhance Travis testing to use gcc 8 and test C++17 and C17
This commit is contained in:
parent
3e4b7269c0
commit
1c46662c39
2 changed files with 17 additions and 1 deletions
14
.travis.yml
14
.travis.yml
|
|
@ -297,6 +297,18 @@ matrix:
|
||||||
env: SWIGLANG=python SWIG_CC=gcc-7 SWIG_CXX=g++-7 CPP14=1
|
env: SWIGLANG=python SWIG_CC=gcc-7 SWIG_CXX=g++-7 CPP14=1
|
||||||
sudo: required
|
sudo: required
|
||||||
dist: trusty
|
dist: trusty
|
||||||
|
- os: linux
|
||||||
|
env: SWIGLANG=csharp SWIG_CC=gcc-8 SWIG_CXX=g++-8 CPP17=1
|
||||||
|
sudo: required
|
||||||
|
dist: trusty
|
||||||
|
- os: linux
|
||||||
|
env: SWIGLANG=java SWIG_CC=gcc-8 SWIG_CXX=g++-8 CPP17=1
|
||||||
|
sudo: required
|
||||||
|
dist: trusty
|
||||||
|
- os: linux
|
||||||
|
env: SWIGLANG=python SWIG_CC=gcc-8 SWIG_CXX=g++-8 CPP17=1 PY3=3 VER=3.6
|
||||||
|
sudo: required
|
||||||
|
dist: trusty
|
||||||
- compiler: gcc
|
- compiler: gcc
|
||||||
os: osx
|
os: osx
|
||||||
env: SWIGLANG=
|
env: SWIGLANG=
|
||||||
|
|
@ -363,7 +375,7 @@ install:
|
||||||
- if test "$TRAVIS_OS_NAME" = "osx"; then source Tools/travis-osx-install.sh; fi
|
- if test "$TRAVIS_OS_NAME" = "osx"; then source Tools/travis-osx-install.sh; fi
|
||||||
- if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++11; fi
|
- if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++11; fi
|
||||||
- if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++14; fi
|
- if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++14; fi
|
||||||
- if test -n "$CPP17"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++17 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++17; fi
|
- if test -n "$CPP17"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++17 -Wall -Wextra" "CFLAGS=-std=c17 -Wall -Wextra") && export CSTD=c17 && export CPPSTD=c++17; fi
|
||||||
- ls -la $(which $CC)
|
- ls -la $(which $CC)
|
||||||
- ls -la $(which $CXX)
|
- ls -la $(which $CXX)
|
||||||
- $CC --version
|
- $CC --version
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,10 @@ elif [[ "$CC" == gcc-7 ]]; then
|
||||||
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
||||||
travis_retry sudo apt-get -qq update
|
travis_retry sudo apt-get -qq update
|
||||||
travis_retry sudo apt-get install -qq g++-7
|
travis_retry sudo apt-get install -qq g++-7
|
||||||
|
elif [[ "$CC" == gcc-8 ]]; then
|
||||||
|
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
||||||
|
travis_retry sudo apt-get -qq update
|
||||||
|
travis_retry sudo apt-get install -qq g++-8
|
||||||
fi
|
fi
|
||||||
|
|
||||||
travis_retry sudo apt-get -qq install libboost-dev
|
travis_retry sudo apt-get -qq install libboost-dev
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue