resolve conflict in travis_config.rb

1 files changed, 7 insertions, 2 deletions

diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake
index 8f5881f3b..c92400cf9 100644
--- a/tasks/mruby_build.rake
+++ b/tasks/mruby_build.rake
@@ -43,7 +43,7 @@ module MRuby
     end
     include Rake::DSL
     include LoadGems
-    attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir
+    attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir, :enable_bintest
     attr_reader :libmruby, :gems
 
     COMPILERS = %w(cc cxx objc asm)
@@ -175,7 +175,12 @@ module MRuby
       puts ">>> Test #{name} <<<"
       mrbtest = exefile("#{build_dir}/test/mrbtest")
       sh "#{filename mrbtest.relative_path}#{$verbose ? ' -v' : ''}"
-      puts 
+      puts
+      run_bintest if @enable_bintest
+    end
+
+    def run_bintest
+      sh "ruby test/bintest.rb"
     end
 
     def print_build_summary