summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2016-10-16 12:17:53 +0100
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2016-10-16 12:17:53 +0100
commitd8434e47acf26f8728022f11532bd2e5a9d282dd (patch)
tree2b641eaf3c1757557c96cca905c0761cbe1df0cd /.travis.yml
parent87bede9a996b92ba67ba16ee14c2af5d0190bb4c (diff)
downloadswig-d8434e47acf26f8728022f11532bd2e5a9d282dd.tar.gz
Updates for Travis testing where the default Xcode changed from 6.1 to 7.3
See https://blog.travis-ci.com/2016-10-04-osx-73-default-image-live/
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 6109d835c..8121c4b43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -151,10 +151,9 @@ matrix:
env: SWIGLANG=python SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
sudo: required
dist: trusty
- allow_failures:
- # Turn off osx testing to fix numerous problems due to default xcode change from 6.1 to 7.3
- - os: osx
- env: SWIGLANG= SWIG_CC=gcc-4.2 SWIG_CXX=g++-4.2
+ - compiler: gcc
+ os: osx
+ env: SWIGLANG=
- compiler: clang
os: osx
env: SWIGLANG=
@@ -192,6 +191,7 @@ matrix:
os: osx
env: SWIGLANG=tcl
+ allow_failures:
# Lots of failing tests currently
- compiler: gcc
os: linux