Commit 968e3b94 authored by KOBAYASHI Shuji's avatar KOBAYASHI Shuji

Set `GEMNAME` on bintest

parent bf922c9f
...@@ -22,9 +22,7 @@ def assertion_string(err, str, iso=nil, e=nil, bt=nil) ...@@ -22,9 +22,7 @@ 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 && $mrbtest_assert.size > 0 if $mrbtest_assert && $mrbtest_assert.size > 0
$mrbtest_assert.each do |idx, assert_msg, diff| $mrbtest_assert.each do |idx, assert_msg, diff|
msg += "\n - Assertion[#{idx}] Failed: #{assert_msg}\n#{diff}" msg += "\n - Assertion[#{idx}] Failed: #{assert_msg}\n#{diff}"
......
$:.unshift File.dirname(File.dirname(File.expand_path(__FILE__))) $:.unshift File.dirname(File.dirname(File.expand_path(__FILE__)))
require 'test/assert.rb' require 'test/assert.rb'
GEMNAME = ""
def cmd(s) def cmd(s)
case RbConfig::CONFIG['host_os'] case RbConfig::CONFIG['host_os']
when /mswin(?!ce)|mingw|bccwin/ when /mswin(?!ce)|mingw|bccwin/
...@@ -30,6 +32,7 @@ ARGV.each do |gem| ...@@ -30,6 +32,7 @@ ARGV.each do |gem|
end end
Dir["#{gem}/bintest/**/*.rb"].each do |file| Dir["#{gem}/bintest/**/*.rb"].each do |file|
GEMNAME.replace(File.basename(gem))
load file load file
end end
end end
......
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