diff options
| author | Wushin <pasekei@gmail.com> | 2015-06-19 21:52:58 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-06-19 21:52:58 -0500 |
| commit | 079e8815d62e052d654c4263f75cf7007f1cd4c3 (patch) | |
| tree | 62597b8dada337e1e86ed16e35cf2241fa0732fc /.travis.yml | |
| parent | 9d3e5757b1598028be49d4565712002593ae77ed (diff) | |
| parent | 097e924102d7f9de5fed7c7bc537e378b72a6340 (diff) | |
| download | tmwa-079e8815d62e052d654c4263f75cf7007f1cd4c3.tar.gz tmwa-079e8815d62e052d654c4263f75cf7007f1cd4c3.tar.bz2 tmwa-079e8815d62e052d654c4263f75cf7007f1cd4c3.tar.xz tmwa-079e8815d62e052d654c4263f75cf7007f1cd4c3.zip | |
Merge pull request #73 from wushin/travis-update
Update Travis for gcc 5
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d857970..accc0ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,8 +57,8 @@ script: - mkdir build - cd build - git init - - echo ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6` $EXTRA_CONFIGURE_ARGS - - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6` $EXTRA_CONFIGURE_ARGS + - echo ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi` $EXTRA_CONFIGURE_ARGS + - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi` $EXTRA_CONFIGURE_ARGS - make -R -k -j2 - make -R -k -j2 test TESTER='valgrind --error-exitcode=1 --track-fds=yes' @@ -102,6 +102,8 @@ matrix: env: REAL_CC=gcc-4.8 REAL_CXX=g++-4.8 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.8 DEBUGPACKAGE=libstdc++6-4.8-dbg - compiler: gcc env: REAL_CC=gcc-4.9 REAL_CXX=g++-4.9 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.9 DEBUGPACKAGE=libstdc++6-4.9-dbg + - compiler: gcc + env: REAL_CC=gcc-5 REAL_CXX=g++-5 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-5 DEBUGPACKAGE=libstdc++6-5-dbg - compiler: gcc env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.7 DEBUGPACKAGE=libstdc++6-4.8-dbg EXTRA_CONFIGURE_ARGS=--disable-warnings |