resolve conflict in travis_config.rb

2 files changed, 11 insertions, 2 deletions

diff --git a/test/assert.rb b/test/assert.rb
index 3d35fc267..d2d865649 100644
--- a/test/assert.rb
+++ b/test/assert.rb
@@ -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
diff --git a/test/bintest.rb b/test/bintest.rb
new file mode 100644
index 000000000..e9dbb285e
--- /dev/null
+++ b/test/bintest.rb
@@ -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'