diff options
-rw-r--r-- | t/GNUmakefile | 13 |
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 |