1 files changed, 48 insertions, 2 deletions
diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake
index 33f1fdb48..4c27686f2 100644
--- a/tasks/mrbgems_test.rake
+++ b/tasks/mrbgems_test.rake
@@ -1,5 +1,12 @@
 MRuby.each_target do
+  no_mrb_open_test_gem = []
+
   gems.each do |g|
+    unless g.run_test_in_other_mrb_state?
+      no_mrb_open_test_gem << g
+      next
+    end
+
     test_rbobj = g.test_rbireps.ext(exts.object)
 
     file test_rbobj => g.test_rbireps
@@ -10,6 +17,13 @@ MRuby.each_target do
           File.expand_path(g.test_preload, dir)
         }.find {|file| File.exist?(file) }
 
+        f.puts %Q[/*]
+        f.puts %Q[ * This file contains a test code for #{g.name} gem.]
+        f.puts %Q[ *]
+        f.puts %Q[ * IMPORTANT:]
+        f.puts %Q[ *   This file was generated!]
+        f.puts %Q[ *   All manual changes will get lost.]
+        f.puts %Q[ */]
         if test_preload.nil?
           f.puts %Q[extern const uint8_t mrbtest_assert_irep[];]
         else
@@ -79,8 +93,7 @@ MRuby.each_target do
             f.puts %Q[    val2 = mrb_ary_shift(mrb2, ary2);]
             f.puts %Q[    ]
             f.puts %Q[    while (mrb_test(val2)) {]
-            f.puts %Q[      char *str = mrb_string_value_cstr(mrb2, &val2);]
-            f.puts %Q[      mrb_ary_push(mrb, ary1, mrb_str_new_cstr(mrb, str));]
+            f.puts %Q[      mrb_ary_push(mrb, ary1, mrb_str_new(mrb, RSTRING_PTR(val2), RSTRING_LEN(val2)));]
             f.puts %Q[      val2 = mrb_ary_shift(mrb2, ary2);]
             f.puts %Q[    }]
             f.puts %Q[  }]
@@ -93,4 +106,37 @@ MRuby.each_target do
     end
 
   end
+
+  no_mrb_open_test = "#{build_dir}/test/no_mrb_open_test"
+  no_mrb_open_test_rbfiles = no_mrb_open_test_gem.reduce([]) { |res, v|
+    res += v.test_rbfiles
+  }
+  file "#{no_mrb_open_test}.o" => "#{no_mrb_open_test}.c"
+  file "#{no_mrb_open_test}.c" => no_mrb_open_test_rbfiles do |t|
+    open(t.name, 'w') do |f|
+      f.puts %Q[/*]
+      f.puts %Q[ * This file contains a test code for following gems:]
+      no_mrb_open_test_gem.each { |g| f.puts %Q[ *   #{g.name}] }
+      f.puts %Q[ *]
+      f.puts %Q[ * IMPORTANT:]
+      f.puts %Q[ *   This file was generated!]
+      f.puts %Q[ *   All manual changes will get lost.]
+      f.puts %Q[ */]
+
+      f.puts %Q[]
+
+      f.puts %Q[\#include "mruby.h"]
+      f.puts %Q[\#include "mruby/irep.h"]
+
+      f.puts %Q[]
+
+      mrbc.run f, no_mrb_open_test_rbfiles, "no_mrb_open_gem_test_irep"
+
+      f.puts %Q[]
+
+      f.puts %Q[void no_mrb_open_mrbgem_test(mrb_state *mrb) {]
+      f.puts %Q[  mrb_load_irep(mrb, no_mrb_open_gem_test_irep);]
+      f.puts %Q[}]
+    end
+  end
 end