summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authortake_cheeze <[email protected]>2014-07-12 21:26:47 +0900
committertake_cheeze <[email protected]>2014-07-12 21:41:44 +0900
commit3b8a797a4cc227006942fb780590c6513bb53dc7 (patch)
treed523319c93f7863f023f68d6e95a0bc0bfef009e /test
parenta16a53b5ebc0fb6a7dc448130ea8f34575d85a3d (diff)
downloadmruby-3b8a797a4cc227006942fb780590c6513bb53dc7.tar.gz
mruby-3b8a797a4cc227006942fb780590c6513bb53dc7.zip
Fix rake failure since `mrbtest_objs` isn't flattened.
Append generated test object to `@test_objs` of mrbgem spec. Add method `custom_test_init?` to check whether mrbgem has custom test init function.
Diffstat (limited to 'test')
-rw-r--r--test/mrbtest.rake7
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