diff options
author | Eric Wong <normalperson@yhbt.net> | 2014-01-29 21:56:32 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2014-01-29 21:56:32 +0000 |
commit | b8cba3a5fd92fc9365702b8987230b27e5fcfcf2 (patch) | |
tree | 6a73cfc4f8e3892ef2fcc054c362d8cc30b74c44 | |
parent | 332ed08d87f881d2c44ad30b9e5da7434cce9b69 (diff) | |
download | rainbows-b8cba3a5fd92fc9365702b8987230b27e5fcfcf2.tar.gz |
EM 1.0.3 got released and seems to work under Ruby 2.1, so re-enable EM and NeverBlock tests again.
-rw-r--r-- | t/GNUmakefile | 11 | ||||
-rw-r--r-- | t/test_isolate.rb | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/t/GNUmakefile b/t/GNUmakefile index 19aacbe..4843e37 100644 --- a/t/GNUmakefile +++ b/t/GNUmakefile @@ -35,7 +35,7 @@ models += StreamResponseEpoll ifeq ($(RUBY_ENGINE),ruby) rp := ) - ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*|2.0.*$(rp) echo true;;esac) + ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*|2.*$(rp) echo true;;esac) ifeq ($(ONENINE),true) ifeq ($(RUBY_VERSION),1.9.2) models += Revactor @@ -46,13 +46,8 @@ ifeq ($(RUBY_ENGINE),ruby) 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 + models += EventMachine + models += NeverBlock endif endif diff --git a/t/test_isolate.rb b/t/test_isolate.rb index 8f701ab..411612a 100644 --- a/t/test_isolate.rb +++ b/t/test_isolate.rb @@ -26,7 +26,7 @@ Isolate.now!(opts) do gem 'sendfile', '1.2.1' gem 'cool.io', '1.1.0' - gem 'eventmachine', '1.0.0' + gem 'eventmachine', '1.0.3' gem 'sinatra', '1.3.3' gem 'async_sinatra', '1.0.0' |