Add mruby-test build config and update :test task to use mrbgem binary

Removed old mrbgems_test.rake which was merged into mrbgem spec

4 files changed, 15 insertions, 100 deletions

diff --git a/Rakefile b/Rakefile
index 89dab05e7..574c1365a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -26,9 +26,6 @@ load "#{MRUBY_ROOT}/mrblib/mrblib.rake"
 load "#{MRUBY_ROOT}/tasks/mrbgems.rake"
 load "#{MRUBY_ROOT}/tasks/libmruby.rake"
 
-load "#{MRUBY_ROOT}/tasks/mrbgems_test.rake"
-load "#{MRUBY_ROOT}/test/mrbtest.rake"
-
 load "#{MRUBY_ROOT}/tasks/benchmark.rake"
 
 ##############################
@@ -117,9 +114,11 @@ task :all => depfiles do
 end
 
 desc "run all mruby tests"
-task :test => ["all"] + MRuby.targets.values.map { |t| t.build_mrbtest_lib_only? ? t.libfile("#{t.build_dir}/test/mrbtest") : t.exefile("#{t.build_dir}/test/mrbtest") } do
+task :test => ["all"] do
   MRuby.each_target do
-    run_test unless build_mrbtest_lib_only?
+    if gems.find { |v| v.name == 'mruby-test' }
+      run_test unless build_mrbtest_lib_only?
+    end
   end
 end
 
diff --git a/build_config.rb b/build_config.rb
index 3408f19a1..e1178d6b2 100644
--- a/build_config.rb
+++ b/build_config.rb
@@ -108,6 +108,16 @@ MRuby::Build.new('host-debug') do |conf|
   # conf.enable_bintest
 end
 
+MRuby::Build.new('test') do |conf|
+  toolchain :gcc
+
+  enable_debug
+  conf.enable_bintest
+
+  conf.gembox 'default'
+  conf.gem :core => "mruby-test"
+end
+
 # Define cross build settings
 # MRuby::CrossBuild.new('32bit') do |conf|
 #   toolchain :gcc
diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake
deleted file mode 100644
index 0ee508360..000000000
--- a/tasks/mrbgems_test.rake
+++ /dev/null
@@ -1,94 +0,0 @@
-MRuby.each_target do
-  gem_table = gems.generate_gem_table self
-
-  gems.each do |g|
-    test_rbobj = g.test_rbireps.ext(exts.object)
-    g.test_objs << test_rbobj
-    dep_list = gems.tsort_dependencies(g.test_dependencies, gem_table).select(&:generate_functions)
-
-    file test_rbobj => g.test_rbireps
-    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|
-      FileUtils.mkdir_p File.dirname(t.name)
-      open(t.name, 'w') do |f|
-        g.print_gem_test_header(f)
-        test_preload = g.test_preload and [g.dir, MRUBY_ROOT].map {|dir|
-          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
-          g.build.mrbc.run f, test_preload, "gem_test_irep_#{g.funcname}_preload"
-        end
-        g.test_rbfiles.flatten.each_with_index do |rbfile, i|
-          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, mrb_bool verbose);]
-        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;]
-          unless g.test_args.empty?
-            f.puts %Q[  mrb_value 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_core(mrb_default_allocf, NULL);]
-            f.puts %Q[  if (mrb2 == NULL) {]
-            f.puts %Q[    fprintf(stderr, "Invalid mrb_state, exiting \%s", __FUNCTION__);]
-            f.puts %Q[    exit(EXIT_FAILURE);]
-            f.puts %Q[  }]
-            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, mrb_test(mrb_gv_get(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"))));]
-            if test_preload.nil?
-              f.puts %Q[  mrb_load_irep(mrb2, mrbtest_assert_irep);]
-            else
-              f.puts %Q[  mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_preload);]
-            end
-            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[  mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern_lit(mrb2, "GEMNAME"), mrb_str_new(mrb2, "#{g.name}", #{g.name.length}));]
-
-            unless g.test_args.empty?
-              f.puts %Q[  test_args_hash = mrb_hash_new_capa(mrb, #{g.test_args.length}); ]
-              g.test_args.each do |arg_name, arg_value|
-                escaped_arg_name = arg_name.gsub('\\', '\\\\\\\\').gsub('"', '\"')
-                escaped_arg_value = arg_value.gsub('\\', '\\\\\\\\').gsub('"', '\"')
-                f.puts %Q[  mrb_hash_set(mrb2, test_args_hash, mrb_str_new(mrb2, "#{escaped_arg_name.to_s}", #{escaped_arg_name.to_s.length}), mrb_str_new(mrb2, "#{escaped_arg_value.to_s}", #{escaped_arg_value.to_s.length})); ]
-              end
-              f.puts %Q[  mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern_lit(mrb2, "TEST_ARGS"), test_args_hash); ]
-            end
-
-            f.puts %Q[  mrb_#{g.funcname}_gem_test(mrb2);] if g.custom_test_init?
-
-            f.puts %Q[  mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_#{i});]
-            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
-        end
-        f.puts %Q[}]
-      end
-    end
-  end
-end
diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake
index 9f8b4eda5..b3a5dcdad 100644
--- a/tasks/mruby_build.rake
+++ b/tasks/mruby_build.rake
@@ -249,7 +249,7 @@ EOS
 
     def run_test
       puts ">>> Test #{name} <<<"
-      mrbtest = exefile("#{build_dir}/test/mrbtest")
+      mrbtest = exefile("#{build_dir}/bin/mrbtest")
       sh "#{filename mrbtest.relative_path}#{$verbose ? ' -v' : ''}"
       puts
       run_bintest if @enable_bintest