diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | scripts/test.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 43323f3c6..871956398 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: - ./scripts/test.sh pydeps before_script: - - sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 + - sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 || true script: - ./scripts/test.sh @@ -52,4 +52,5 @@ matrix: dist: precise - compiler: clang os: osx + osx_image: xcode7 env: TEST=osx diff --git a/scripts/test.sh b/scripts/test.sh index a91086422..a43d724ba 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -96,7 +96,7 @@ osx) export ACLOCAL_PATH=$BREW_PREFIX/opt/gettext/share/aclocal:$ACLOCAL_PATH for pkg in openssl curl do - PKG_CONFIG_PATH=$BREW_PREFIX/opt/$PKG/lib/pkgconfig:$PKG_CONFIG_PATH + PKG_CONFIG_PATH=$BREW_PREFIX/opt/$pkg/lib/pkgconfig:$PKG_CONFIG_PATH CPPFLAGS="-I$BREW_PREFIX/opt/$pkg/include $CPPFLAGS" LDFLAGS="-L$BREW_PREFIX/opt/$pkg/lib $LDFLAGS" done |