Commit a4402590 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #911 from bovi/verbose

Rake respects verbose flag also for test and clean target
parents e4e7f705 bdd908c9
...@@ -32,7 +32,6 @@ load "#{MRUBY_ROOT}/tools/mirb/mirb.rake" ...@@ -32,7 +32,6 @@ load "#{MRUBY_ROOT}/tools/mirb/mirb.rake"
load "#{MRUBY_ROOT}/tasks/mrbgems_test.rake" load "#{MRUBY_ROOT}/tasks/mrbgems_test.rake"
load "#{MRUBY_ROOT}/test/mrbtest.rake" load "#{MRUBY_ROOT}/test/mrbtest.rake"
############################## ##############################
# generic build targets, rules # generic build targets, rules
task :default => :all task :default => :all
...@@ -42,7 +41,7 @@ depfiles = MRuby.targets['host'].bins.map do |bin| ...@@ -42,7 +41,7 @@ depfiles = MRuby.targets['host'].bins.map do |bin|
source_path = MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}") source_path = MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
file install_path => source_path do |t| file install_path => source_path do |t|
FileUtils.cp t.prerequisites.first, t.name FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
end end
install_path install_path
...@@ -72,8 +71,8 @@ end ...@@ -72,8 +71,8 @@ end
desc "clean all built and in-repo installed artifacts" desc "clean all built and in-repo installed artifacts"
task :clean do task :clean do
MRuby.each_target do |t| MRuby.each_target do |t|
FileUtils.rm_rf t.build_dir FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
end end
FileUtils.rm_f depfiles FileUtils.rm_f depfiles, { :verbose => $verbose }
puts "Cleaned up build folder" puts "Cleaned up build folder"
end end
...@@ -163,7 +163,7 @@ module MRuby ...@@ -163,7 +163,7 @@ module MRuby
def run_test def run_test
puts ">>> Test #{name} <<<" puts ">>> Test #{name} <<<"
mrbtest = exefile("#{build_dir}/test/mrbtest") mrbtest = exefile("#{build_dir}/test/mrbtest")
sh "#{filename mrbtest.relative_path}" sh "#{filename mrbtest.relative_path}#{$verbose ? ' -v' : ''}"
puts puts
end end
......
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