diff options
| author | Felix Jones <[email protected]> | 2017-02-16 13:33:46 +0000 |
|---|---|---|
| committer | Felix Jones <[email protected]> | 2017-02-16 13:33:46 +0000 |
| commit | d83aad8d570e4bbffa3bd3ce64e210f78afa425f (patch) | |
| tree | 5389a87c135b1bdf3e23a1ba02e02400b7cf80fc /test/assert.rb | |
| parent | 70aa6dc38d75dd6b1e2c76f290bc576e36e36ea3 (diff) | |
| parent | b165708c8deba00685f9a27926c554aaa7f3b0fb (diff) | |
| download | mruby-d83aad8d570e4bbffa3bd3ce64e210f78afa425f.tar.gz mruby-d83aad8d570e4bbffa3bd3ce64e210f78afa425f.zip | |
Merge branch 'master' into android.rake-ndk-clang
Diffstat (limited to 'test/assert.rb')
| -rw-r--r-- | test/assert.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/assert.rb b/test/assert.rb index e8368c64c..7efc24e19 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -44,7 +44,8 @@ def assert(str = 'Assertion failed', iso = '') begin $mrbtest_assert = [] $mrbtest_assert_idx = 0 - if(!yield || $mrbtest_assert.size > 0) + yield + if($mrbtest_assert.size > 0) $asserts.push(assertion_string('Fail: ', str, iso, nil)) $ko_test += 1 t_print('F') @@ -213,7 +214,7 @@ def report() t_print("\n") $asserts.each do |msg| - puts msg + t_print "#{msg}\n" end $total_test = $ok_test+$ko_test+$kill_test @@ -232,7 +233,7 @@ end ## # Performs fuzzy check for equality on methods returning floats def check_float(a, b) - tolerance = 1e-12 + tolerance = Mrbtest::FLOAT_TOLERANCE a = a.to_f b = b.to_f if a.finite? and b.finite? |