diff options
| author | mattn <[email protected]> | 2013-03-01 14:42:42 +0900 |
|---|---|---|
| committer | mattn <[email protected]> | 2013-03-01 14:42:42 +0900 |
| commit | 261efd8e9dc3bdaf4438797a9cdb34f7792a5639 (patch) | |
| tree | 2a3b8b19d045089479fbfcece1e1318f17c32223 /tasks | |
| parent | 4c4cf0a4ce738fde01a047194b52a5389b400e89 (diff) | |
| parent | 138ecf4723078cf8ef4342fb3995db23003eff01 (diff) | |
| download | mruby-261efd8e9dc3bdaf4438797a9cdb34f7792a5639.tar.gz mruby-261efd8e9dc3bdaf4438797a9cdb34f7792a5639.zip | |
Merge branch 'master' into pluggable_struct
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/mrbgems_test.rake | 6 | ||||
| -rw-r--r-- | tasks/mruby_build.rake | 2 |
2 files changed, 6 insertions, 2 deletions
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);] 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 |