Skip SSL setup on OS X, allow OS X to fail

Author: sodabrew

.travis.yml

@@ -25,7 +25,10 @@ before_install:
     "
   - |
     bash -c " # Configure SSL support
-    sudo bash .travis_ssl.sh
+    if [[ ! x$OSTYPE =~ ^xdarwin ]]; then
+      sudo bash .travis_ssl.sh
+      sudo service mysql restart
+    fi
     "
   - mysqld --version
   - mysql -u root -e "CREATE DATABASE IF NOT EXISTS test"
@@ -43,6 +46,7 @@ matrix:
   allow_failures:
     - env: DB=mysql57
     - rvm: rbx-2
+    - os: osx
   include:
     - rvm: 2.0.0
       env: DB=mariadb55

.travis_ssl.sh

@@ -60,14 +60,5 @@ ssl-cert=/etc/mysql/server-cert.pem
 ssl-key=/etc/mysql/server-key.pem
 " >> my.cnf
 
-# FIXME The startdate code above isn't doing the trick, we must wait until the minute moves
+# Wait until the minute moves to ensure that the SSL cert is within its valid range
 ruby -e 'start = Time.now.min; while Time.now.min == start; sleep 2; end'
-
-# Ok, let's see what we got!
-set +e
-if [ "$(uname)" == "Darwin" ]; then
-  brew tap homebrew/boneyard
-  brew services restart mysql
-else
-  service mysql restart
-fi