diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2015-07-10 21:54:59 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2015-07-10 22:02:14 +0100 |
| commit | f815209c7de45103f8d983fd71356323c52b2851 (patch) | |
| tree | 189d9d8dccb16c0de72f26dcafcacfc946bb83d5 /.travis.yml | |
| parent | 5a282f3ac372c286981901b8f779ddb1d71bf688 (diff) | |
| download | swig-f815209c7de45103f8d983fd71356323c52b2851.tar.gz | |
Travis testing c++11 and gcc5
Modify testflags.py to control the -std= option passed to gcc
Install new boost for c++11 with gcc5 testing
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f4921f8cf..5ca17c7ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,9 +92,10 @@ before_install: - uname -a - lsb_release -a - sudo apt-get -qq update - - time sudo apt-get -qq install libboost-dev - - if test -z "$SWIGLANG"; then sudo apt-get -qq install yodl; fi - if test -n "$GCC5"; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get -qq update && sudo apt-get install -qq g++-5 && export CC=gcc-5 && export CXX=g++-5; fi + - if test -z "$GCC5"; then sudo apt-get -qq install libboost-dev; fi + - if test -n "$GCC5"; then sudo add-apt-repository -y ppa:boost-latest/ppa && sudo apt-get -qq update && sudo apt-get install -qq libboost1.55-dev; fi + - if test -z "$SWIGLANG"; then sudo apt-get -qq install yodl; fi - if test "$SWIGLANG" = "csharp"; then sudo apt-get -qq install mono-devel; fi - if test "$SWIGLANG" = "d"; then wget http://downloads.dlang.org/releases/2014/dmd_2.066.0-0_amd64.deb; sudo dpkg -i dmd_2.066.0-0_amd64.deb; fi - if test "$SWIGLANG" = "go"; then go env | sed -e 's/^/export /' > goenvsetup && source goenvsetup && rm -f goenvsetup; fi # Until configure.ac is fixed @@ -119,8 +120,8 @@ before_install: - $CC --version - $CXX --version # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic. - - export cflags=$(Tools/testflags.py --language $SWIGLANG --cflags) && echo $cflags - - export cxxflags=$(Tools/testflags.py --language $SWIGLANG --cxxflags) && echo $cxxflags + - if test -n "$SWIGLANG"; then export cflags=$(Tools/testflags.py --language $SWIGLANG --cflags --std=$CSTD) && echo $cflags; fi + - if test -n "$SWIGLANG"; then export cxxflags=$(Tools/testflags.py --language $SWIGLANG --cxxflags --std=$CPPSTD) && echo $cxxflags; fi script: - echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r' - echo "${CONFIGOPTS[@]}" |