X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/659ef8fe6e0fdaa4672bccf54f30f2a4b51f5917..7e143ab37a8cac78278615789ce22f0a81cd424c:/spec/spec_helper.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3a07436..82b152c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,13 @@ require 'vimrunner'
 require 'vimrunner/rspec'
 
 Vimrunner::RSpec.configure do |config|
-  config.reuse_server = true
+  # 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
+  #  - 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
@@ -13,6 +19,7 @@ Vimrunner::RSpec.configure do |config|
     # vim.add_plugin(plugin_path, 'indent/python.vim')
 
     vim.command "set rtp^=#{plugin_path}"
+    vim.command "runtime syntax/python.vim"
     vim.command "runtime indent/python.vim"
 
     vim