Merge pull request #2924 from zzak/mruby-test

Extract mrbtest to binary gem

1 files changed, 4 insertions, 5 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