Unverified Commit 2098acee authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto Committed by GitHub

Merge pull request #5020 from jethrodaniel/master

only use GEMNAME if defined in assert.rb
parents 613e0bee 3157efa5
...@@ -56,7 +56,9 @@ def assertion_string(err, str, iso=nil, e=nil, bt=nil) ...@@ -56,7 +56,9 @@ def assertion_string(err, str, iso=nil, e=nil, bt=nil)
msg = "#{err}#{str}" msg = "#{err}#{str}"
msg += " [#{iso}]" if iso && !iso.empty? msg += " [#{iso}]" if iso && !iso.empty?
msg += " => #{e}" if e && !e.to_s.empty? msg += " => #{e}" if e && !e.to_s.empty?
if Object.const_defined?(:GEMNAME)
msg += " (#{GEMNAME == 'mruby-test' ? 'core' : "mrbgems: #{GEMNAME}"})" msg += " (#{GEMNAME == 'mruby-test' ? 'core' : "mrbgems: #{GEMNAME}"})"
end
if $mrbtest_assert if $mrbtest_assert
$mrbtest_assert.each do |idx, assert_msg, diff| $mrbtest_assert.each do |idx, assert_msg, diff|
msg += "\n - Assertion[#{idx}]" msg += "\n - Assertion[#{idx}]"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment