Merge branch 'master' of github.com:mruby/mruby

3 files changed, 9 insertions, 1 deletions

diff --git a/mrbgems/mruby-array-ext/test/array.rb b/mrbgems/mruby-array-ext/test/array.rb
index ed1edb5c2..8c6a7bd54 100644
--- a/mrbgems/mruby-array-ext/test/array.rb
+++ b/mrbgems/mruby-array-ext/test/array.rb
@@ -139,5 +139,10 @@ assert("Array#reverse_each") do
     b << i
   end
   assert_equal [ "d", "c", "b", "a" ], b
-  assert_equal [ "d", "c", "b", "a" ], a.reverse_each.to_a
+
+  if Object.const_defined?(:Enumerator)
+    assert_equal [ "d", "c", "b", "a" ], a.reverse_each.to_a
+  else
+    true
+  end
 end
diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
index 938eb1716..02a85af05 100644
--- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c
+++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
@@ -90,6 +90,7 @@ os_count_objects(mrb_state *mrb, mrb_value self)
       COUNT_TYPE(T_FILE);
       COUNT_TYPE(T_ENV);
       COUNT_TYPE(T_DATA);
+      COUNT_TYPE(T_FIBER);
 #undef COUNT_TYPE
     default:
       type = mrb_fixnum_value(i); break;
diff --git a/mrbgems/mruby-objectspace/test/objectspace.rb b/mrbgems/mruby-objectspace/test/objectspace.rb
index 2362fd3f0..e70650e84 100644
--- a/mrbgems/mruby-objectspace/test/objectspace.rb
+++ b/mrbgems/mruby-objectspace/test/objectspace.rb
@@ -1,5 +1,6 @@
 assert('ObjectSpace.count_objects') do
   h = {}
+  f = Fiber.new {} if Object.const_defined? :Fiber
   ObjectSpace.count_objects(h)
   assert_kind_of(Hash, h)
   assert_true(h.keys.all? {|x| x.is_a?(Symbol) || x.is_a?(Integer) })
@@ -7,6 +8,7 @@ assert('ObjectSpace.count_objects') do
 
   assert_true(h.has_key?(:TOTAL))
   assert_true(h.has_key?(:FREE))
+  assert_true(h.has_key?(:T_FIBER)) if Object.const_defined? :Fiber
 
   h = ObjectSpace.count_objects
   assert_kind_of(Hash, h)