summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortake-cheeze <[email protected]>2018-06-21 11:33:34 +0900
committertake-cheeze <[email protected]>2018-06-21 11:33:34 +0900
commitacd04ad519355882d42a00cf78926bb32b591509 (patch)
tree2cfe207c3de9ade411fdaa821e347a7c6dfe881c
parentfd9617cad0a5ba65934a896b8fe7908994babad6 (diff)
downloadmruby-acd04ad519355882d42a00cf78926bb32b591509.tar.gz
mruby-acd04ad519355882d42a00cf78926bb32b591509.zip
Support verbose mode in bintest.
-rw-r--r--lib/mruby/build.rb8
-rw-r--r--test/bintest.rb4
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index 57bd9c51e..affff9df0 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -293,10 +293,14 @@ 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
run_bintest if bintest_enabled?
end
@@ -304,7 +308,7 @@ EOS
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('\\', '/')