From c70abbaefbc4ea3fa6450e341bf3818ceca8b2fa Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Sat, 11 Apr 2015 13:19:43 -0700
Subject: test with yajl-ruby concurrently loaded

---
 Gemfile             | 5 +++++
 spec/spec_helper.rb | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/Gemfile b/Gemfile
index 45b8081..34b35ca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,11 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0'
 end
 
+group :development do
+  # for testing loading concurrently with yajl-ruby, not on jruby
+  gem 'yajl-ruby', :platforms => [ :ruby, :mswin, :mingw ]
+end
+
 group :development_extras do
   gem 'rubocop', '= 0.21.0'
   gem 'reek', '= 1.3.7'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 71a397b..267983e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,11 @@
 $: << File.expand_path(File.join(File.dirname( __FILE__ ), "../lib"))
 
+begin
+  require 'yajl'
+rescue LoadError
+  # yajl can't be installed on jruby
+end
+
 require 'ffi_yajl'
 
 RSpec.configure do |c|
-- 
cgit v1.2.1