summary refs log tree commit homepage
path: root/t
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2013-02-26 07:42:51 +0000
committerEric Wong <normalperson@yhbt.net>2013-02-26 07:42:51 +0000
commitf8b5181e744848468bf3bb0fe469795f9113cf4c (patch)
treea44ca04256f3c59d0c3987dd7d985c787eb26db2 /t
parent95d6719722f31987c72052b000f67d99989a81c8 (diff)
EventMachine/NeverBlock currently do not build on Ruby 2.0.0
Diffstat (limited to 't')
-rw-r--r--t/GNUmakefile13
1 files changed, 10 insertions, 3 deletions
diff --git a/t/GNUmakefile b/t/GNUmakefile
index 6c9b07b..19aacbe 100644
--- a/t/GNUmakefile
+++ b/t/GNUmakefile
@@ -30,13 +30,12 @@ models += WriterThreadSpawn
 models += ThreadPool
 models += ThreadSpawn
 models += Coolio
-models += EventMachine
-models += NeverBlock
+
 models += StreamResponseEpoll
 
 ifeq ($(RUBY_ENGINE),ruby)
   rp := )
-  ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*$(rp) echo true;;esac)
+  ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*|2.0.*$(rp) echo true;;esac)
   ifeq ($(ONENINE),true)
     ifeq ($(RUBY_VERSION),1.9.2)
       models += Revactor
@@ -46,6 +45,14 @@ ifeq ($(RUBY_ENGINE),ruby)
     models += CoolioThreadPool
     models += CoolioThreadSpawn
     models += CoolioFiberSpawn
+
+    # EventMachine 1.0.0 currently does not build on Ruby 2.0.0
+    # NeverBlock depends on 2.0.0
+    RBTWO := $(shell case $(RUBY_VERSION) in 2.0.*$(rp) echo true;;esac)
+    ifeq ($(RBTWO),)
+      models += EventMachine
+      models += NeverBlock
+    endif
   endif
 endif