From dfd284500993687d3df746042d5bb6cb2f6cd75f Mon Sep 17 00:00:00 2001
From: Roddie Kieley <rkieley@unifiedsoftworx.com>
Date: Wed, 1 Nov 2017 23:31:37 -0230
Subject: [PATCH] PROTON-1342: CI on OS X - configured travis matrix with
 osx_images for Xcode 7.3 10.11 and Xcode 9 10.13 with SASL_IMPL none and
 PROACTOR libuv

---
 .travis.yml | 30 +++++++++++++++++++++++-------
 README.md   |  6 +++---
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f162dcbe92..6c09b64230 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,19 +17,30 @@
 # under the License
 #
 
-os: linux
 sudo: false
 language: cpp
 compiler:
 - gcc
 - clang
-env:
-- QPID_PROTON_CMAKE_ARGS=
-- QPID_PROTON_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Coverage
+
 matrix:
-  exclude:
-  - compiler: clang
-    env: QPID_PROTON_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Coverage
+  include:
+  - os: linux
+    env:
+    - QPID_PROTON_CMAKE_ARGS='-DCMAKE_BUILD_TYPE=Coverage'
+
+  - os: osx
+    osx_image: xcode7.3
+    env:
+    - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11'
+
+  - os: osx
+    osx_image: xcode9
+    env:
+    - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13'
+
+# Note addons is apt specific at the moment and will not be applied for osx.
+# See before_install brew commands below
 addons:
   apt:
     packages:
@@ -47,6 +58,11 @@ addons:
     - golang
     - lcov
 
+before_install:
+- eval "${MATRIX_EVAL}"
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libuv openssl; fi
+
 install:
 - pip install --user --upgrade pip
 - pip install --user coverage tox
diff --git a/README.md b/README.md
index 8b34f638b7..5544b8e3c9 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 Qpid Proton - AMQP messaging toolkit
 ====================================
 
-Linux Build | Windows Build
-------------|--------------
-[![Linux Build Status](https://travis-ci.org/apache/qpid-proton.svg?branch=master)](https://travis-ci.org/apache/qpid-proton) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/apache/qpid-proton?branch=master&svg=true)](https://ci.appveyor.com/project/ke4qqq/qpid-proton/branch/master)
+Linux Build | Windows Build | OSX Build
+------------|---------------|----------
+[![Linux Build Status](https://travis-ci.org/apache/qpid-proton.svg?branch=master)](https://travis-ci.org/apache/qpid-proton) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/apache/qpid-proton?branch=master&svg=true)](https://ci.appveyor.com/project/ke4qqq/qpid-proton/branch/master) | [![OSX Build Status](https://api.travis-ci.org/RoddieKieley/qpid-proton.svg?branch=PROTON-522)](https://travis-ci.org/roddiekieley/qpid-proton/branch/PROTON-522)
 
 Qpid Proton is a high-performance, lightweight messaging library. It can be
 used in the widest range of messaging applications, including brokers, client