# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1458050111 -28800
# Node ID c792271027ebf4744dc72d760c99552173a9ccef
# Parent  3f4af834314d7d3d10c107a04f2a79aa62251f26# Parent  71698088bdac5bc86d649e2cce0fca869b84ed70
Merge pull request #23 from Chocobo1/travis_fix

TravisCI: re-enable MULTI=1 & NOWRITEV=1 builds on OSX

diff -r 3f4af834314d -r c792271027eb .travis.yml
--- a/.travis.yml	Tue Mar 15 21:41:22 2016 +0800
+++ b/.travis.yml	Tue Mar 15 21:55:11 2016 +0800
@@ -16,10 +16,6 @@
   exclude:
     - os: osx
       env: BUNDLEDLIBTOM=--disable-bundled-libtom WEXTRAFLAGS=-Werror
-    - os: osx
-      env: MULTI=1
-    - os: osx
-      env: NOWRITEV=1
 
 compiler:
   - gcc
@@ -40,11 +36,11 @@
   - if [ "$CC" = "clang" ]; then WEXTRAFLAGS="$WEXTRAFLAGS -Wno-error=incompatible-library-redeclaration" ; fi  # workaround
 
 install:
-  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$BUNDLEDLIBTOM" != "--enable-bundled-libtom" ]; then brew update > /dev/null && brew install libtomcrypt libtommath ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$BUNDLEDLIBTOM" = "--disable-bundled-libtom" ]; then brew update > /dev/null && brew install libtomcrypt libtommath ; fi
 
 script:
   - autoconf && autoheader && ./configure "$BUNDLEDLIBTOM" CFLAGS="-O2 -Wall -Wno-pointer-sign $WEXTRAFLAGS" --prefix="$HOME/inst"
-  - if [ "$NOWRITEV" = "1" ]; then sed -i s/HAVE_WRITEV/DONT_HAVE_WRITEV/ config.h ; fi
+  - if [ "$NOWRITEV" = "1" ]; then sed -i -e s/HAVE_WRITEV/DONT_HAVE_WRITEV/ config.h ; fi
   - make -j3 install
 
 after_success: