Merge pull request #4055 from take-cheeze/verbose_bintest

Support verbose mode in bintest.

2 files changed, 10 insertions, 2 deletions

diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index 83c7404b8..047ae13dc 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -293,17 +293,21 @@ EOS
       @build_mrbtest_lib_only
     end
 
+    def verbose_flag
+      $verbose ? ' -v' : ''
+    end
+
     def run_test
       puts ">>> Test #{name} <<<"
       mrbtest = exefile("#{build_dir}/bin/mrbtest")
-      sh "#{filename mrbtest.relative_path}#{$verbose ? ' -v' : ''}"
+      sh "#{filename mrbtest.relative_path}#{verbose_flag}"
       puts
     end
 
     def run_bintest
       targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map { |v| filename v.dir }
       targets << filename(".") if File.directory? "./bintest"
-      sh "ruby test/bintest.rb #{targets.join ' '}"
+      sh "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
     end
 
     def print_build_summary
diff --git a/test/bintest.rb b/test/bintest.rb
index 12971a9d9..b62419d44 100644
--- a/test/bintest.rb
+++ b/test/bintest.rb
@@ -20,6 +20,10 @@ def shellquote(s)
 end
 
 ARGV.each do |gem|
+  case gem
+  when '-v'; $mrbtest_verbose = true
+  end
+
   case RbConfig::CONFIG['host_os']
   when /mswin(?!ce)|mingw|bccwin/
     gem = gem.gsub('\\', '/')