X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/9370cda99be0cfe529c40e5c6ce48ef01940a266..f4f95ee041370e3e79bb72cb9b360a4ec5707785:/spec/spec_helper.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 022f65b..82b152c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,8 +2,13 @@ require 'vimrunner'
 require 'vimrunner/rspec'
 
 Vimrunner::RSpec.configure do |config|
+  # Use a single Vim instance for the test suite. Set to false to use an
+  # instance per test (slower, but can be easier to manage).
   # FIXME: reuse_server = true seems to hang after a certain number of test cases
-  config.reuse_server = false
+  #  - Travis CI hangs after 15 successful tests.
+  #  - Locally it may hang also, with Vim and Xorg using 100% CPU.
+  # Therefore default to false in both cases.
+  config.reuse_server = ENV['CI'] ? false : false
 
   config.start_vim do
     vim = Vimrunner.start