From 3b8a797a4cc227006942fb780590c6513bb53dc7 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Sat, 12 Jul 2014 21:26:47 +0900 Subject: 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. --- test/mrbtest.rake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/mrbtest.rake') 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 -- cgit v1.2.3