summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-07-09 13:34:38 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-07-09 13:34:38 +0900
commit42d4eb9fe4fb46a4f3c33ab3f9fe954babd2638b (patch)
tree6a9c8601542c4d221fd65a80d1a23cebda1100f0
parent506cda5a28b56750cb70b7b2a80317da524928c4 (diff)
parentab779b7ad8988f090e36e57eaa6774e54b24f679 (diff)
downloadmruby-42d4eb9fe4fb46a4f3c33ab3f9fe954babd2638b.tar.gz
mruby-42d4eb9fe4fb46a4f3c33ab3f9fe954babd2638b.zip
Merge pull request #2452 from take-cheeze/test_exc
Use `mrb_print_error` in test error handling.
-rw-r--r--tasks/mrbgems_test.rake4
-rw-r--r--test/driver.c2
-rw-r--r--test/init_mrbtest.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake
index a6e9eb99e..2fdf5f171 100644
--- a/tasks/mrbgems_test.rake
+++ b/tasks/mrbgems_test.rake
@@ -55,7 +55,7 @@ MRuby.each_target do
f.puts %Q[ mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_preload);]
end
f.puts %Q[ if (mrb2->exc) {]
- f.puts %Q[ mrb_p(mrb2, mrb_obj_value(mrb2->exc));]
+ f.puts %Q[ mrb_print_error(mrb2);]
f.puts %Q[ exit(EXIT_FAILURE);]
f.puts %Q[ }]
f.puts %Q[ mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern_lit(mrb2, "GEMNAME"), mrb_str_new(mrb2, "#{g.name}", #{g.name.length}));]
@@ -74,7 +74,7 @@ MRuby.each_target do
f.puts %Q[ mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_#{i});]
f.puts %Q[ if (mrb2->exc) {]
- f.puts %Q[ mrb_p(mrb2, mrb_obj_value(mrb2->exc));]
+ f.puts %Q[ mrb_print_error(mrb2);]
f.puts %Q[ exit(EXIT_FAILURE);]
f.puts %Q[ }]
f.puts %Q[ ]
diff --git a/test/driver.c b/test/driver.c
index f605d7517..d4c29b532 100644
--- a/test/driver.c
+++ b/test/driver.c
@@ -48,7 +48,7 @@ eval_test(mrb_state *mrb)
return_value = mrb_load_string(mrb, prog);
/* did an exception occur? */
if (mrb->exc) {
- mrb_p(mrb, return_value);
+ mrb_print_error(mrb);
mrb->exc = 0;
return EXIT_FAILURE;
}
diff --git a/test/init_mrbtest.c b/test/init_mrbtest.c
index 717578dc8..3ce42f661 100644
--- a/test/init_mrbtest.c
+++ b/test/init_mrbtest.c
@@ -16,7 +16,7 @@ mrb_init_mrbtest(mrb_state *mrb)
mrbgemtest_init(mrb);
#endif
if (mrb->exc) {
- mrb_p(mrb, mrb_obj_value(mrb->exc));
+ mrb_print_error(mrb);
exit(EXIT_FAILURE);
}
}