admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4293 from shuujii/integrate-init_mrbtest.c-to-driver.c-in-mruby-test-mrbgem

Browse Source 
Integrate `init_mrbtest.c` to `driver.c` in `mruby-test` mrbgem
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-02-23 10:31:40 +09:00
committed by GitHub
parent 5cc277340f f209f781ac
commit f5cfb77078
3 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-test/driver.c
+5 -3
View File
@@ -18,8 +18,9 @@
#include <mruby/variable.h>
#include <mruby/array.h>
void
mrb_init_mrbtest(mrb_state *);
extern const uint8_t mrbtest_assert_irep[];
void mrbgemtest_init(mrb_state* mrb);
/* Print a short remark for the user */
static void
@@ -167,7 +168,8 @@ main(int argc, char **argv)
}
mrb_init_test_driver(mrb, verbose);
mrb_init_mrbtest(mrb);
mrb_load_irep(mrb, mrbtest_assert_irep);
mrbgemtest_init(mrb);
ret = eval_test(mrb);
mrb_close(mrb);
mrbgems/mruby-test/init_mrbtest.c
-39
View File
@@ -1,39 +0,0 @@
#include <stdlib.h>
#include <mruby.h>
#include <mruby/irep.h>
#include <mruby/variable.h>
extern const uint8_t mrbtest_assert_irep[];
void mrbgemtest_init(mrb_state* mrb);
void mrb_init_test_driver(mrb_state* mrb, mrb_bool verbose);
void mrb_t_pass_result(mrb_state *mrb_dst, mrb_state *mrb_src);
void
mrb_init_mrbtest(mrb_state *mrb)
{
mrb_state *core_test;
mrb_load_irep(mrb, mrbtest_assert_irep);
core_test = mrb_open_core(mrb_default_allocf, NULL);
if (core_test == NULL) {
fprintf(stderr, "Invalid mrb_state, exiting %s", __FUNCTION__);
exit(EXIT_FAILURE);
}
mrb_init_test_driver(core_test, mrb_test(mrb_gv_get(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"))));
mrb_load_irep(core_test, mrbtest_assert_irep);
mrb_t_pass_result(mrb, core_test);
#ifndef DISABLE_GEMS
mrbgemtest_init(mrb);
#endif
if (mrb->exc) {
mrb_print_error(mrb);
mrb_close(mrb);
exit(EXIT_FAILURE);
}
mrb_close(core_test);
}
mrbgems/mruby-test/mrbgem.rake
+3 -4
View File
@@ -144,8 +144,6 @@ MRuby::Gem::Specification.new('mruby-test') do |spec|
end
end
init = "#{spec.dir}/init_mrbtest.c"
# store the last gem selection and make the re-build
# of the test gem depending on a change to the gem
# selection
@@ -164,7 +162,7 @@ MRuby::Gem::Specification.new('mruby-test') do |spec|
file clib => active_gems_path if active_gem_list != current_gem_list
file mlib => clib
file clib => [init, build.mrbcfile, __FILE__] do |_t|
file clib => [build.mrbcfile, __FILE__] do |_t|
_pp "GEN", "*.rb", "#{clib.relative_path}"
FileUtils.mkdir_p File.dirname(clib)
open(clib, 'w') do |f|
@@ -177,7 +175,8 @@ MRuby::Gem::Specification.new('mruby-test') do |spec|
f.puts %Q[ * All manual changes will get lost.]
f.puts %Q[ */]
f.puts %Q[]
f.puts IO.read(init)
f.puts %Q[struct mrb_state;]
f.puts %Q[typedef struct mrb_state mrb_state;]
build.gems.each do |g|
f.puts %Q[void GENERATED_TMP_mrb_#{g.funcname}_gem_test(mrb_state *mrb);]
end