aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rw-r--r--test/functional/helpers.lua5
2 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index af3a88ed52..d464d67bb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ matrix:
- os: osx
env: CI_TARGET=gcc
compiler: gcc-4.9
+ fast_finish: true
before_install:
# Pins the version of the java package installed on the Travis VMs
# and avoids a lengthy upgrade process for them.
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index ea98ff4ce3..e63c79ec80 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -1,3 +1,8 @@
+if jit then
+ -- Disable JIT because of random errors on Travis with OS X.
+ jit.off(true, true)
+end
+
require('coxpcall')
local Loop = require('nvim.loop')
local MsgpackStream = require('nvim.msgpack_stream')