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

Resolved conflicts in #4320

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-07-29 01:02:03 +09:00
parent 3ac98009d3
commit cd8fc9bcb8
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-test/driver.c
+1
View File
@@ -258,6 +258,7 @@ mrb_t_pass_result(mrb_state *mrb_dst, mrb_state *mrb_src)
TEST_COUNT_PASS(ok_test);
TEST_COUNT_PASS(ko_test);
TEST_COUNT_PASS(kill_test);
TEST_COUNT_PASS(warning_test);
TEST_COUNT_PASS(skip_test);
#undef TEST_COUNT_PASS
test/assert.rb
+13 -7
View File
@@ -2,6 +2,7 @@ $undefined = Object.new
$ok_test = 0
$ko_test = 0
$kill_test = 0
$warning_test = 0
$skip_test = 0
$asserts = []
$test_start = Time.now if Object.const_defined?(:Time)
@@ -103,6 +104,10 @@ def assert(str = 'Assertion failed', iso = '')
$ko_test += 1
t_print('F')
end
elsif $mrbtest_assert_idx == 0
$asserts.push(assertion_string('Warn: ', str, iso, 'no assertion'))
$warning_test += 1
t_print('W')
else
$ok_test += 1
t_print('.')
@@ -332,17 +337,18 @@ def report
t_print("#{msg}\n")
end
$total_test = $ok_test + $ko_test + $kill_test + $skip_test
t_print("Total: #{$total_test}\n")
$total_test = $ok_test + $ko_test + $kill_test + $warning_test + $skip_test
t_print(" Total: #{$total_test}\n")
t_print(" OK: #{$ok_test}\n")
t_print(" KO: #{$ko_test}\n")
t_print("Crash: #{$kill_test}\n")
t_print(" Skip: #{$skip_test}\n")
t_print(" OK: #{$ok_test}\n")
t_print(" KO: #{$ko_test}\n")
t_print(" Crash: #{$kill_test}\n")
t_print("Warning: #{$warning_test}\n")
t_print(" Skip: #{$skip_test}\n")
if Object.const_defined?(:Time)
t_time = Time.now - $test_start
t_print(" Time: #{t_time.round(2)} seconds\n")
t_print(" Time: #{t_time.round(2)} seconds\n")
end
$ko_test == 0 && $kill_test == 0