summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--t/GNUmakefile15
-rw-r--r--t/test_isolate.rb22
2 files changed, 21 insertions, 16 deletions
diff --git a/t/GNUmakefile b/t/GNUmakefile
index 4843e37..c456877 100644
--- a/t/GNUmakefile
+++ b/t/GNUmakefile
@@ -29,7 +29,6 @@ models += WriterThreadPool
 models += WriterThreadSpawn
 models += ThreadPool
 models += ThreadSpawn
-models += Coolio
 
 models += StreamResponseEpoll
 
@@ -42,12 +41,16 @@ ifeq ($(RUBY_ENGINE),ruby)
     endif
     models += FiberSpawn
     models += FiberPool
-    models += CoolioThreadPool
-    models += CoolioThreadSpawn
-    models += CoolioFiberSpawn
 
-    models += EventMachine
-    models += NeverBlock
+    RUBY_LE_2_1 := $(shell $(RUBY) -e 'puts((RUBY_VERSION.to_f <= 2.1).to_s))')
+    ifeq ($(RUBY_LE_2_1), true)
+      models += Coolio
+      models += CoolioThreadPool
+      models += CoolioThreadSpawn
+      models += CoolioFiberSpawn
+      models += EventMachine
+      models += NeverBlock
+    endif
   endif
 endif
 
diff --git a/t/test_isolate.rb b/t/test_isolate.rb
index ee66ea3..4ae4894 100644
--- a/t/test_isolate.rb
+++ b/t/test_isolate.rb
@@ -23,25 +23,27 @@ Isolate.now!(opts) do
   gem 'unicorn', '4.8.3'
 
   if engine == "ruby"
-    gem 'sendfile', '1.2.1'
-    gem 'cool.io', '1.1.0'
-
-    gem 'eventmachine', '1.0.3'
-    gem 'async_sinatra', '1.0.0'
-
-    gem 'neverblock', '0.1.6.2'
+    gem 'sendfile', '1.2.2'
+    if RUBY_VERSION.to_f < 2.2
+      gem 'cool.io', '1.1.0'
+      gem 'eventmachine', '1.0.3'
+      gem 'async_sinatra', '1.0.0'
+      gem 'neverblock', '0.1.6.2'
+    end
   end
 
   if defined?(::Fiber) && engine == "ruby"
-    gem 'revactor', '0.1.5'
-    gem 'rack-fiber_pool', '0.9.2'
+    if RUBY_VERSION.to_f < 2.2
+      gem 'revactor', '0.1.5'
+      gem 'rack-fiber_pool', '0.9.2' # depends on EM
+    end
   end
 
   if RUBY_PLATFORM =~ /linux/
     gem 'sleepy_penguin', '3.3.0'
 
     # is 2.6.32 new enough?
-    gem 'io_splice', '4.2.0' if `uname -r`.strip > '2.6.32'
+    gem 'io_splice', '4.3.0' if `uname -r`.strip > '2.6.32'
   end
 end