resolve conflict in travis_config.rb

This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-02-10 09:50:32 +09:00
7 changed files with 48 additions and 5 deletions
+3 -2
View File
@@ -9,10 +9,11 @@ def t_print(*args)
i = 0
len = args.size
while i < len
str = args[i].to_s
begin
__printstr__ args[i].to_s
__printstr__ str
rescue NoMethodError
__t_printstr__ args[i].to_s
__t_printstr__ str rescue print str
end
i += 1
end
+8
View File
@@ -0,0 +1,8 @@
$:.unshift File.dirname(File.dirname(File.expand_path(__FILE__)))
require 'test/assert.rb'
Dir['mrbgems/**/bintest/*.rb'].each do |file|
load file
end
load 'test/report.rb'