Use enable_test for host build to take advantage of mruby/mruby#2940

Author: Zachary Scott

Rakefile

@@ -23,14 +23,13 @@ end
 namespace :test do
   desc "run mruby & unit tests"
   # only build mtest for host
-  task :mtest => [:compile] + MRuby.targets.values.map {|t| t.build_mrbtest_lib_only? ? nil : t.exefile("#{t.build_dir}/test/mrbtest") }.compact do
+  task :mtest => :compile do
     # in order to get mruby/test/t/synatx.rb __FILE__ to pass,
     # we need to make sure the tests are built relative from mruby_root
-    load "#{mruby_root}/test/mrbtest.rake"
     MRuby.each_target do |target|
       # only run unit tests here
       target.enable_bintest = false
-      run_test unless build_mrbtest_lib_only?
+      run_test if target.test_enabled?
     end
   end
 
@@ -50,7 +49,7 @@ namespace :test do
   task :bintest => :compile do
     MRuby.each_target do |target|
       clean_env(%w(MRUBY_ROOT MRUBY_CONFIG)) do
-        run_bintest if bintest_enabled?
+        run_bintest if target.bintest_enabled?
       end
     end
   end

build_config.rb

@@ -10,6 +10,7 @@ def gem_config(conf)
 
   conf.enable_bintest
   conf.enable_debug
+  conf.enable_test
 
   gem_config(conf)
 end

mrblib/setup.rb

@@ -120,6 +120,7 @@ def gem_config(conf)
 
   conf.enable_bintest
   conf.enable_debug
+  conf.enable_test
 
   gem_config(conf)
 end
@@ -320,15 +321,13 @@ def rakefile
 namespace :test do
   desc "run mruby & unit tests"
   # only build mtest for host
-  task :mtest => [:compile] + MRuby.targets.values.map {|t| t.build_mrbtest_lib_only? ? nil : t.exefile("\#{t.build_dir}/test/mrbtest") }.compact do
-    # mruby-io tests expect to be in mruby_root
+  task :mtest => :compile do
     # in order to get mruby/test/t/synatx.rb __FILE__ to pass,
     # we need to make sure the tests are built relative from mruby_root
-    load "\#{mruby_root}/test/mrbtest.rake"
     MRuby.each_target do |target|
       # only run unit tests here
       target.enable_bintest = false
-      run_test unless build_mrbtest_lib_only?
+      run_test if target.test_enabled?
     end
   end
 
@@ -348,7 +347,7 @@ def clean_env(envs)
   task :bintest => :compile do
     MRuby.each_target do |target|
       clean_env(%w(MRUBY_ROOT MRUBY_CONFIG)) do
-        run_bintest if bintest_enabled?
+        run_bintest if target.bintest_enabled?
       end
     end
   end