From d61db6a2645fe5267d02412637fe90abe4930d51 Mon Sep 17 00:00:00 2001
From: Thomas Sanchez <thomas.sanchz@gmail.com>
Date: Wed, 3 Feb 2016 16:44:08 +0100
Subject: [PATCH 1/2] Better travis + enable mac os x

---
 .travis.yml | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 482acd0..b5b40d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,22 @@
 language:
     - cpp
 
+os:
+  - linux
+  - osx
+
 compiler:
     - clang
     - gcc
 
-sudo: required
-dist: trusty
+matrix:
+  allow_failures:
+    - os: osx
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+    - os: osx
 
 env:
     global:
@@ -22,12 +32,22 @@ env:
         - BUILD_EXAMPLES="ON" BUILD_TESTS="ON" CMAKE_BUILD_TYPE="Debug"   HTTPP_PARSER_BACKEND=Stream USE_BOOST_PROMISE=OFF
 
 
+addons:
+    apt:
+        packages:
+            - clang-3.6
+            - g++-4.8
+            - libboost-all-dev
+            - libssl-dev
+            - libtbb-dev
+            - cmake
+            - libcurl4-openssl-dev
+            - libhwloc-dev
+
 before_install:
     - git submodule update --init --recursive
-
-install:
-    - sudo apt-get update
-    - sudo apt-get install -y clang-3.6 g++-4.8 libboost-all-dev libssl-dev libtbb-dev cmake
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap homebrew/science && brew update ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install tbb hwloc; fi
 
 before_script:
     # update compilers

From d2b73e878256aca5d78c1cc1dcdee78aee6e8d74 Mon Sep 17 00:00:00 2001
From: Thomas Sanchez <thomas.sanchz@gmail.com>
Date: Thu, 4 Feb 2016 16:51:29 +0100
Subject: [PATCH 2/2] test

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

diff --git a/.travis.yml b/.travis.yml
index b5b40d4..0646991 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,6 @@ env:
         - BUILD_EXAMPLES="ON" BUILD_TESTS="ON" CMAKE_BUILD_TYPE="Release" HTTPP_PARSER_BACKEND=Stream USE_BOOST_PROMISE=OFF
         - BUILD_EXAMPLES="ON" BUILD_TESTS="ON" CMAKE_BUILD_TYPE="Debug"   HTTPP_PARSER_BACKEND=Stream USE_BOOST_PROMISE=OFF
 
-
 addons:
     apt:
         packages:
@@ -51,8 +50,8 @@ before_install:
 
 before_script:
     # update compilers
-    - if [ "${CXX}" == "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
-    - if [ "${CXX}" == "clang++" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
+    - if [ "$TRAVIS_OS_NAME" != "osx" && "${CXX}" == "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+    - if [ "$TRAVIS_OS_NAME" != "osx" && "${CXX}" == "clang++" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
 
 script:
     - rm -rf build