diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-02-28 05:31:47 -0800 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-02-28 05:31:47 -0800 |
| commit | a440259033be37f8a08359bb5a05d29f77d23619 (patch) | |
| tree | 7a8ca796ba5a8ae5130c0621f8d7f37ae8eaab3d | |
| parent | e4e7f70588fc0883a3d13ebdded81ce721899c47 (diff) | |
| parent | bdd908c92e04970e72e4d468ddefb81243767ee8 (diff) | |
| download | mruby-a440259033be37f8a08359bb5a05d29f77d23619.tar.gz mruby-a440259033be37f8a08359bb5a05d29f77d23619.zip | |
Merge pull request #911 from bovi/verbose
Rake respects verbose flag also for test and clean target
| -rw-r--r-- | Rakefile | 7 | ||||
| -rw-r--r-- | tasks/mruby_build.rake | 2 |
2 files changed, 4 insertions, 5 deletions
@@ -32,7 +32,6 @@ load "#{MRUBY_ROOT}/tools/mirb/mirb.rake" load "#{MRUBY_ROOT}/tasks/mrbgems_test.rake" load "#{MRUBY_ROOT}/test/mrbtest.rake" - ############################## # generic build targets, rules task :default => :all @@ -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}") file install_path => source_path do |t| - FileUtils.cp t.prerequisites.first, t.name + FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose } end install_path @@ -72,8 +71,8 @@ end desc "clean all built and in-repo installed artifacts" task :clean do MRuby.each_target do |t| - FileUtils.rm_rf t.build_dir + FileUtils.rm_rf t.build_dir, { :verbose => $verbose } end - FileUtils.rm_f depfiles + FileUtils.rm_f depfiles, { :verbose => $verbose } puts "Cleaned up build folder" end diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index 4d28b1d95..812e861a7 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -163,7 +163,7 @@ module MRuby def run_test puts ">>> Test #{name} <<<" mrbtest = exefile("#{build_dir}/test/mrbtest") - sh "#{filename mrbtest.relative_path}" + sh "#{filename mrbtest.relative_path}#{$verbose ? ' -v' : ''}" puts end |
