From fa3774081e0f114ade74aae7e5e0d74d2b24cf7c Mon Sep 17 00:00:00 2001
From: Ted Nyman <ted@github.com>
Date: Sun, 19 Jun 2016 21:49:44 -0700
Subject: [PATCH 1/3] Test on Travis for both linux and osx

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1e1ce30..63f03cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,10 @@ compiler:
   - gcc
   - clang
 
+os:
+  - linux
+  - osx
+
 addons:
   apt:
     packages:

From 16a459d0080fa767bebc819699cad82b72412af2 Mon Sep 17 00:00:00 2001
From: Ted Nyman <ted@github.com>
Date: Sun, 19 Jun 2016 22:05:34 -0700
Subject: [PATCH 2/3] Add a before_script for the OS X environment

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 63f03cd..0315f66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ os:
   - linux
   - osx
 
+before_script:
+    - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update; brew install redis; fi
+
 addons:
   apt:
     packages:

From 9deb78140f4513f897b5a06de94c2445bd9cc932 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <janerik@fnordig.de>
Date: Mon, 20 Jun 2016 11:08:34 +0200
Subject: [PATCH 3/3] chore(CI): Exclude valgrind jobs on OSX

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0315f66..ad08076 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,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