From 1f692ab0ba1def0291bf63cd8c295180d8fcc0e3 Mon Sep 17 00:00:00 2001
From: "Xuejie \"Rafael\" Xiao" <xxuejie@gmail.com>
Date: Wed, 27 Feb 2013 21:29:49 -0500
Subject: Do not generate test_args_hash variable if it is not used

---
 tasks/mrbgems_test.rake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tasks')

diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake
index 6d40d092a..6ca5eaef2 100644
--- a/tasks/mrbgems_test.rake
+++ b/tasks/mrbgems_test.rake
@@ -18,7 +18,11 @@ MRuby.each_target do
         f.puts %Q[void GENERATED_TMP_mrb_#{g.funcname}_gem_test(mrb_state *mrb) {]
         unless g.test_rbfiles.empty?
           f.puts %Q[  mrb_state *mrb2;]
-          f.puts %Q[  mrb_value val1, val2, ary1, ary2, test_args_hash;]
+          if g.test_args.empty?
+            f.puts %Q[  mrb_value val1, val2, ary1, ary2;]
+          else
+            f.puts %Q[  mrb_value val1, val2, ary1, ary2, test_args_hash;]
+          end
           f.puts %Q[  int ai;]
           g.test_rbfiles.count.times do |i|
             f.puts %Q[  ai = mrb_gc_arena_save(mrb);]
-- 
cgit v1.2.3


From bdd908c92e04970e72e4d468ddefb81243767ee8 Mon Sep 17 00:00:00 2001
From: Daniel Bovensiepen <daniel@bovensiepen.net>
Date: Thu, 28 Feb 2013 10:30:30 +0000
Subject: Rake respects verbose flag also for test and clean target

---
 Rakefile               | 7 +++----
 tasks/mruby_build.rake | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'tasks')

diff --git a/Rakefile b/Rakefile
index 1c65321f5..33967b07b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -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
 
-- 
cgit v1.2.3