changeset 1263:c792271027eb

Merge pull request #23 from Chocobo1/travis_fix TravisCI: re-enable MULTI=1 & NOWRITEV=1 builds on OSX
author Matt Johnston <matt@ucc.asn.au>
date Tue, 15 Mar 2016 21:55:11 +0800
parents 3f4af834314d (current diff) 71698088bdac (diff)
children a20b6af6f182 81ae6ed4e2f4
files
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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: