From 24a7f55fa612758fe8cb8c27146aa09c0e68f058 Mon Sep 17 00:00:00 2001
From: Greg Cobb and JR Boyens <pair+gcobb+jboyens@pivotallabs.com>
Date: Thu, 18 Jul 2013 17:11:10 -0700
Subject: [PATCH] DEBIAN env variable is defined on the OS X host as well

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

diff --git a/.travis.yml b/.travis.yml
index 0dfc9816..973ae991 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
-#before_script:
-  # - "sh -e /etc/init.d/xvfb start"
 before_install:
   - "export DISPLAY=:99.0"
-  - "test $DEBIAN_FRONTEND && sh -e /etc/init.d/xvfb start"
+  - "test "Darwin" != `uname` && sh -e /etc/init.d/xvfb start"
     #- "sh -e travis-chromium-script.sh"
 script: "DISPLAY=:99.0 bundle exec rake core_spec"
 
@@ -16,7 +14,6 @@ env:
   - JASMINE_BROWSER=firefox
   #- JASMINE_BROWSER=chrome
   - JASMINE_BROWSER=phantomjs
-  - JASMINE_BROWSER=safari
 
 matrix:
   allow_failures:
@@ -24,7 +21,4 @@ matrix:
     - env: JASMINE_BROWSER=phantomjs
   include:
     - language: objective-c
-      env: JASMINE_BROWSER=safari
-  exclude:
-    - language: ruby
-      env: JASMINE_BROWSER=safari
+      env: JASMINE_BROWSER=safari
\ No newline at end of file