diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-07-12 23:28:19 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-07-12 23:28:19 +0900 |
| commit | ee9d409eedff7988b464607bbbb98df3ca21b99a (patch) | |
| tree | e4080ba4e14f4f9d5aa988f93c0247656e3bf0d6 /test | |
| parent | c41f39578c902153ab9f44e9f11ef26b49b43038 (diff) | |
| parent | 3b8a797a4cc227006942fb780590c6513bb53dc7 (diff) | |
| download | mruby-ee9d409eedff7988b464607bbbb98df3ca21b99a.tar.gz mruby-ee9d409eedff7988b464607bbbb98df3ca21b99a.zip | |
Merge pull request #2463 from take-cheeze/fix_rake
Fix rake failure since `mrbtest_objs` isn't flattened.
Diffstat (limited to 'test')
| -rw-r--r-- | test/mrbtest.rake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/mrbtest.rake b/test/mrbtest.rake index 21afad946..b9616fe9d 100644 --- a/test/mrbtest.rake +++ b/test/mrbtest.rake @@ -12,10 +12,11 @@ MRuby.each_target do ass_lib = ass_c.ext(exts.object) mrbtest_lib = libfile("#{current_build_dir}/mrbtest") - mrbtest_objs = gems.map do |v| - v.test_objs + [v.test_rbireps.ext(exts.object)] + mrbtest_objs = [mlib, ass_lib] + gems.each do |v| + mrbtest_objs.concat v.test_objs end - file mrbtest_lib => [mlib, ass_lib] + mrbtest_objs do |t| + file mrbtest_lib => mrbtest_objs do |t| archiver.run t.name, t.prerequisites end |