diff options
Diffstat (limited to 'tasks/mrbgems_test.rake')
| -rw-r--r-- | tasks/mrbgems_test.rake | 95 |
1 files changed, 21 insertions, 74 deletions
diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake index 2fdf5f171..9fc9a9d2a 100644 --- a/tasks/mrbgems_test.rake +++ b/tasks/mrbgems_test.rake @@ -1,16 +1,12 @@ MRuby.each_target do - no_mrb_open_test_gem = [] + gem_table = gems.generate_gem_table 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) + dep_list = gems.tsort_dependencies g.test_dependencies, gem_table file test_rbobj => g.test_rbireps - file g.test_rbireps => [g.test_rbfiles].flatten + [g.build.mrbcfile, __FILE__] do |t| + file g.test_rbireps => [g.test_rbfiles].flatten + [File.join(g.dir, 'mrbgem.rake'), g.build.mrbcfile, __FILE__, "#{MRUBY_ROOT}/tasks/mrbgem_spec.rake"] do |t| open(t.name, 'w') do |f| g.print_gem_test_header(f) test_preload = g.test_preload and [g.dir, MRUBY_ROOT].map {|dir| @@ -33,21 +29,32 @@ MRuby.each_target do g.build.mrbc.run f, rbfile, "gem_test_irep_#{g.funcname}_#{i}" end f.puts %Q[void mrb_#{g.funcname}_gem_test(mrb_state *mrb);] unless g.test_objs.empty? + dep_list.each do |d| + f.puts %Q[void GENERATED_TMP_mrb_#{d.funcname}_gem_init(mrb_state *mrb);] + f.puts %Q[void GENERATED_TMP_mrb_#{d.funcname}_gem_final(mrb_state *mrb);] + end + f.puts %Q[void mrb_init_test_driver(mrb_state *mrb);] + f.puts %Q[void mrb_t_pass_result(mrb_state *dst, mrb_state *src);] f.puts %Q[void GENERATED_TMP_mrb_#{g.funcname}_gem_test(mrb_state *mrb) {] unless g.test_rbfiles.empty? f.puts %Q[ mrb_state *mrb2;] if g.test_args.empty? - f.puts %Q[ mrb_value val1, val2, val3, ary1, ary2;] + f.puts %Q[ mrb_value verbose;] else - f.puts %Q[ mrb_value val1, val2, val3, ary1, ary2, test_args_hash;] + f.puts %Q[ mrb_value verbose, test_args_hash;] end f.puts %Q[ int ai;] g.test_rbfiles.count.times do |i| f.puts %Q[ ai = mrb_gc_arena_save(mrb);] - f.puts %Q[ mrb2 = mrb_open();] - f.puts %Q[ val3 = mrb_gv_get(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"));] - f.puts %Q[ if (mrb_test(val3)) {] - f.puts %Q[ mrb_gv_set(mrb2, mrb_intern_lit(mrb2, "$mrbtest_verbose"), val3);] + f.puts %Q[ mrb2 = mrb_open_core(mrb_default_allocf, NULL);] + dep_list.each do |d| + f.puts %Q[ GENERATED_TMP_mrb_#{d.funcname}_gem_init(mrb2);] + f.puts %Q[ mrb_state_atexit(mrb2, GENERATED_TMP_mrb_#{d.funcname}_gem_final);] + end + f.puts %Q[ mrb_init_test_driver(mrb2);] + f.puts %Q[ verbose = mrb_gv_get(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"));] + f.puts %Q[ if (mrb_test(verbose)) {] + f.puts %Q[ mrb_gv_set(mrb2, mrb_intern_lit(mrb2, "$mrbtest_verbose"), verbose);] f.puts %Q[ }] if test_preload.nil? f.puts %Q[ mrb_load_irep(mrb2, mrbtest_assert_irep);] @@ -73,30 +80,9 @@ MRuby.each_target do f.puts %Q[ mrb_#{g.funcname}_gem_test(mrb2);] unless g.test_objs.empty? f.puts %Q[ mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_#{i});] - f.puts %Q[ if (mrb2->exc) {] - f.puts %Q[ mrb_print_error(mrb2);] - f.puts %Q[ exit(EXIT_FAILURE);] - f.puts %Q[ }] f.puts %Q[ ] - %w(ok_test ko_test kill_test).each do |vname| - f.puts %Q[ val2 = mrb_gv_get(mrb2, mrb_intern_lit(mrb2, "$#{vname}"));] - f.puts %Q[ if (mrb_fixnum_p(val2)) {] - f.puts %Q[ val1 = mrb_gv_get(mrb, mrb_intern_lit(mrb, "$#{vname}"));] - f.puts %Q[ mrb_gv_set(mrb, mrb_intern_lit(mrb, "$#{vname}"), mrb_fixnum_value(mrb_fixnum(val1) + mrb_fixnum(val2)));] - f.puts %Q[ }\n] - end - - f.puts %Q[ ary2 = mrb_gv_get(mrb2, mrb_intern_lit(mrb2, "$asserts"));] - f.puts %Q[ if (mrb_test(ary2)) {] - f.puts %Q[ ary1 = mrb_gv_get(mrb, mrb_intern_lit(mrb, "$asserts"));] - f.puts %Q[ val2 = mrb_ary_shift(mrb2, ary2);] - f.puts %Q[ ] - f.puts %Q[ while (mrb_test(val2)) {] - 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[ }] + f.puts %Q[ mrb_t_pass_result(mrb, mrb2);] f.puts %Q[ mrb_close(mrb2);] f.puts %Q[ mrb_gc_arena_restore(mrb, ai);] end @@ -104,44 +90,5 @@ MRuby.each_target do f.puts %Q[}] end 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 - } - if no_mrb_open_test_rbfiles.empty? - no_mrb_open_test_rbfiles << "#{MRUBY_ROOT}/test/no_mrb_open_test_dummy.rb" - end - - no_mrb_open_test_lib = no_mrb_open_test.ext(exts.object) - file no_mrb_open_test_lib => "#{no_mrb_open_test}.c" - file "#{no_mrb_open_test}.c" => no_mrb_open_test_rbfiles + [MRUBY_CONFIG, __FILE__] 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 |