summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornot-a-robot <not-a-robot@rediger.net>2016-06-20 11:50:03 +0200
committerGitHub <noreply@github.com>2016-06-20 11:50:03 +0200
commitb7205d35fd3262391be924b53eea842522149025 (patch)
treeea33145eb4f54054d683b2a5e7a4c4cbbde28ec7
parent847f3fe5c7fd335aa66ed23e6aff47bf4c12e0aa (diff)
parent9deb78140f4513f897b5a06de94c2445bd9cc932 (diff)
Auto merge of #440 - redis:pr-438, r=badboy
Test on OSX Thanks to @tnm & @xor-gate
-rw-r--r--.travis.yml15
1 files changed, 15 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 1e1ce30..ad08076 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,13 @@ compiler:
- gcc
- clang
+os:
+ - linux
+ - osx
+
+before_script:
+ - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update; brew install redis; fi
+
addons:
apt:
packages:
@@ -21,4 +28,12 @@ env:
- TARGET="32bit" TARGET_VARS="32bit-vars" CFLAGS="-Werror"
- TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
+matrix:
+ exclude:
+ - os: osx
+ env: PRE="valgrind --track-origins=yes --leak-check=full"
+
+ - os: osx
+ env: TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
+
script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE" && make $TARGET_VARS hiredis-example