Resolved conflicts in
MODIFY
mrbgems/mruby-test/driver.c
mrbgems/mruby-test/driver.c
@@ -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

MODIFY
test/assert.rb
test/assert.rb
@@ -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,12 +337,13 @@ def report
t_print("#{msg}\n")
end
- $total_test = $ok_test + $ko_test + $kill_test + $skip_test
+ $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("Warning: #{$warning_test}\n")
t_print(" Skip: #{$skip_test}\n")
if Object.const_defined?(:Time)

Resolved conflicts in #4320