Skip to content

Commit

Permalink
Add gcc6 to the test matrix (#1439)
Browse files Browse the repository at this point in the history
  • Loading branch information
lgritz committed Jun 22, 2016
1 parent fefd185 commit 93c931a
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions .travis.yml
Expand Up @@ -32,6 +32,8 @@ addons:
- g++-4.8
- gcc-5
- g++-5
- gcc-6
- g++-6
- libboost1.55-all-dev
- libgif-dev
- libtiff4-dev
Expand Down Expand Up @@ -153,15 +155,20 @@ matrix:
- os: osx
compiler: clang
env: LINKSTATIC=1 USE_FFMPEG=0 USE_OCIO=0 USE_OPENCV=0
# Linux only: test gcc 5 (sometimes it has new warnings that weren't
# issues for gcc 4.x or clang) and also use a higher SIMD level, avx and
# f16c, to make sure all is well. TravisCI's OSX images don't yet
# support avx/f16c, so we only do this on Linux for now, but eventually
# we'll want to separate these concerns into separate tests.
# Linux only: test gcc 6 (catch new warnings hot off the presses) and
# also use a higher SIMD level, avx and f16c, to make sure all is well.
# TravisCI's OSX images don't yet support avx/f16c, so we only do this
# on Linux for now, but eventually we'll want to separate these concerns
# into separate tests.
- os: linux
dist: trusty
compiler: gcc
env: WHICHGCC=5 USE_SIMD=avx,f16c
env: WHICHGCC=6 USE_SIMD=avx,f16c
# Linux only: test gcc 5
- os: linux
dist: trusty
compiler: gcc
env: WHICHGCC=5
# One more, just for the heck of it, turn all SIMD off, and also make
# sure we're falling back on libjpeg, not jpeg-turbo. I guess this
# should/could be both platforms, but in the interest of making the
Expand Down

0 comments on commit 93c931a

Please sign in to comment.