Subject: [PATCH] Attempt at fixing Travis for OSX.

Move install into external shell script. We cannot use apt-get on OSX, use brew instead... Also valgrind isn't used at the moment so skip intalling it.

diff --git a/.travis.yml b/.travis.yml
index 88d5901..13d5453 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,7 @@ os:
   - osx
 language: c
 install:
-  - sudo apt-get update -qq && sudo apt-get install -y -qq valgrind
-  - if [ x$LWS_METHOD == xlibev ] && [ "$COVERITY_SCAN_BRANCH" != 1 ]; then sudo apt-get install -y -qq libev-dev; fi
+  - ./travis_install.sh
 script:
   - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then mkdir build && cd build && cmake $CMAKE_ARGS .. && cmake --build .; fi
 addons:

diff --git a/travis_install.sh b/travis_install.sh
new file mode 100755 (executable)
index 0000000..96ac72d
--- /dev/null
+++ b/travis_install.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [ "$COVERITY_SCAN_BRANCH" == 1 ]; then exit; fi
+
+if [ "$TRAVIS_OS_NAME" == "linux" ];
+then
+       sudo apt-get update -qq
+
+       if [ "$LWS_METHOD" == "libev" ];
+       then
+               sudo apt-get install -y -qq libev-dev;
+       fi
+fi
+
+if [ "$TRAVIS_OS_NAME" == "osx" ];
+then
+       if [ "$LWS_METHOD" == "libev" ];
+       then
+               brew install libev;
+       fi
+fi
+
+