From 193d737f3a161cea6a41f6a586d60a0a92ac5775 Mon Sep 17 00:00:00 2001
From: Tony Kelman <tony@kelman.net>
Date: Tue, 19 Jan 2016 22:20:29 -0800
Subject: [PATCH] turn osx travis partially back on

[av skip]
---
 .travis.yml    | 9 +++++----
 test/socket.jl | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26cac76a41a5c..4591f0313707c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,8 @@ matrix:
             - bar
             - g++-5
             - gfortran-5
-#    - os: osx # TODO: turn this back on once it's fast enough to not time out
-#      env: ARCH="x86_64"
+    - os: osx
+      env: ARCH="x86_64"
 cache:
   directories:
     - $TRAVIS_BUILD_DIR/deps/srccache
@@ -56,6 +56,7 @@ before_install:
         ln -s /usr/bin/gfortran-5 $HOME/bin/gfortran;
         gcc --version;
         BUILDOPTS="-j3 VERBOSE=1 FORCE_ASSERTIONS=1";
+        export TESTSTORUN="all";
       elif [ `uname` = "Darwin" ]; then
         brew update;
         brew install -v jq bar;
@@ -72,7 +73,7 @@ before_install:
         export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib";
         export DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/lib:/usr/lib:$(brew --prefix openblas-julia)/lib:$(brew --prefix suite-sparse-julia)/lib:$(brew --prefix arpack-julia)/lib";
         make $BUILDOPTS -C contrib -f repackage_system_suitesparse4.make;
-      fi
+        export TESTSTORUN="core"; fi # TODO: turn this back to "all" once it's fast enough to not time out
     - git clone -q git://git.kitenet.net/moreutils
 script:
     - make -C moreutils mispipe
@@ -87,7 +88,7 @@ script:
     - cd .. && mv julia julia2
     - cp /tmp/julia/lib/julia/sys.ji local.ji && /tmp/julia/bin/julia -J local.ji -e 'true' && /tmp/julia/bin/julia-debug -J local.ji -e 'true' && rm local.ji
     - /tmp/julia/bin/julia -e 'versioninfo()'
-    - export JULIA_CPU_CORES=2 && cd /tmp/julia/share/julia/test && /tmp/julia/bin/julia --check-bounds=yes runtests.jl all && /tmp/julia/bin/julia --check-bounds=yes runtests.jl libgit2-online pkg
+    - export JULIA_CPU_CORES=2 && cd /tmp/julia/share/julia/test && /tmp/julia/bin/julia --check-bounds=yes runtests.jl $TESTSTORUN && /tmp/julia/bin/julia --check-bounds=yes runtests.jl libgit2-online pkg
     - cd `dirname $TRAVIS_BUILD_DIR` && mv julia2 julia && rm -rf julia/deps/build/julia-env
 # uncomment the following if failures are suspected to be due to the out-of-memory killer
 #    - dmesg
diff --git a/test/socket.jl b/test/socket.jl
index eb80438adbffc..85d815793d640 100644
--- a/test/socket.jl
+++ b/test/socket.jl
@@ -307,7 +307,7 @@ let
         try
             t = connect(addr)
         finally
-           close(srv)
+            close(srv)
         end
 
         test = !is(t,t0)