Merge pull request #4318 from shuujii/set-GEMNAME-on-bintest

Set `GEMNAME` on bintest

2 files changed, 4 insertions, 3 deletions

diff --git a/test/assert.rb b/test/assert.rb
index 8a723762e..623ec9138 100644
--- a/test/assert.rb
+++ b/test/assert.rb
@@ -22,9 +22,7 @@ def assertion_string(err, str, iso=nil, e=nil, bt=nil)
   msg = "#{err}#{str}"
   msg += " [#{iso}]" if iso && !iso.empty?
   msg += " => #{e}" if e && !e.to_s.empty?
-  if Object.const_defined?(:GEMNAME)
-    msg += " (#{GEMNAME == 'mruby-test' ? 'core' : "mrbgems: #{GEMNAME}"})"
-  end
+  msg += " (#{GEMNAME == 'mruby-test' ? 'core' : "mrbgems: #{GEMNAME}"})"
   if $mrbtest_assert && $mrbtest_assert.size > 0
     $mrbtest_assert.each do |idx, assert_msg, diff|
       msg += "\n - Assertion[#{idx}] Failed: #{assert_msg}\n#{diff}"
diff --git a/test/bintest.rb b/test/bintest.rb
index b62419d44..d0126cfa0 100644
--- a/test/bintest.rb
+++ b/test/bintest.rb
@@ -1,6 +1,8 @@
 $:.unshift File.dirname(File.dirname(File.expand_path(__FILE__)))
 require 'test/assert.rb'
 
+GEMNAME = ""
+
 def cmd(s)
   case RbConfig::CONFIG['host_os']
   when /mswin(?!ce)|mingw|bccwin/
@@ -30,6 +32,7 @@ ARGV.each do |gem|
   end
 
   Dir["#{gem}/bintest/**/*.rb"].each do |file|
+    GEMNAME.replace(File.basename(gem))
     load file
   end
 end