Unverified Commit ade7185a authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto Committed by GitHub

Merge pull request #4055 from take-cheeze/verbose_bintest

Support verbose mode in bintest.
parents 2a9525ca acd04ad5
...@@ -293,17 +293,21 @@ EOS ...@@ -293,17 +293,21 @@ EOS
@build_mrbtest_lib_only @build_mrbtest_lib_only
end end
def verbose_flag
$verbose ? ' -v' : ''
end
def run_test def run_test
puts ">>> Test #{name} <<<" puts ">>> Test #{name} <<<"
mrbtest = exefile("#{build_dir}/bin/mrbtest") mrbtest = exefile("#{build_dir}/bin/mrbtest")
sh "#{filename mrbtest.relative_path}#{$verbose ? ' -v' : ''}" sh "#{filename mrbtest.relative_path}#{verbose_flag}"
puts puts
end end
def run_bintest def run_bintest
targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map { |v| filename v.dir } targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map { |v| filename v.dir }
targets << filename(".") if File.directory? "./bintest" targets << filename(".") if File.directory? "./bintest"
sh "ruby test/bintest.rb #{targets.join ' '}" sh "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
end end
def print_build_summary def print_build_summary
......
...@@ -20,6 +20,10 @@ def shellquote(s) ...@@ -20,6 +20,10 @@ def shellquote(s)
end end
ARGV.each do |gem| ARGV.each do |gem|
case gem
when '-v'; $mrbtest_verbose = true
end
case RbConfig::CONFIG['host_os'] case RbConfig::CONFIG['host_os']
when /mswin(?!ce)|mingw|bccwin/ when /mswin(?!ce)|mingw|bccwin/
gem = gem.gsub('\\', '/') gem = gem.gsub('\\', '/')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment