From cfa7889996eacc96a46e88406894d8f063e2912b Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Mon, 3 Mar 2014 16:53:26 +0900 Subject: run enabled gem's bintest only --- tasks/mruby_build.rake | 3 ++- test/bintest.rb | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index c65ad4c20..432100f8d 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -194,7 +194,8 @@ module MRuby end def run_bintest - sh "ruby test/bintest.rb" + targets = @gems.select { |v| Dir.exists? "#{v.dir}/bintest" }.map { |v| filename v.dir } + sh "ruby test/bintest.rb #{targets.join ' '}" end def print_build_summary diff --git a/test/bintest.rb b/test/bintest.rb index e9dbb285e..0ff3341a0 100644 --- a/test/bintest.rb +++ b/test/bintest.rb @@ -1,8 +1,10 @@ $:.unshift File.dirname(File.dirname(File.expand_path(__FILE__))) require 'test/assert.rb' -Dir['mrbgems/**/bintest/*.rb'].each do |file| - load file +ARGV.each do |gem| + Dir["#{gem}/bintest/*.rb"].each do |file| + load file + end end load 'test/report.rb' -- cgit v1.2.3 From fa5c3d4f517ef5859a0755ca4caeb680240fd060 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Mon, 3 Mar 2014 16:58:27 +0900 Subject: add test to check striped binary works correctly --- mrbgems/mruby-bin-strip/bintest/mruby-strip.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb b/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb index 4f27d2fce..17bd0e71f 100644 --- a/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb +++ b/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb @@ -32,6 +32,7 @@ assert('success') do o = `bin/mruby-strip #{compiled1.path}` assert_equal 0, $?.exitstatus assert_equal "", o + assert_equal `bin/mruby #{script_file.path}`, `bin/mruby -b #{compiled1.path}` o = `bin/mruby-strip #{compiled1.path} #{compiled2.path}` assert_equal 0, $?.exitstatus -- cgit v1.2.3 From 24e3e33cb654cd54aca76acb5390852b8b913bb9 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Mon, 3 Mar 2014 17:01:47 +0900 Subject: use tempfile module --- mrbgems/mruby-bin-mruby/bintest/mruby.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb index 2eb41d758..22872c389 100644 --- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb +++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb @@ -1,3 +1,5 @@ +require 'tempfile' + assert('regression for #1564') do o = `bin/mruby -e '<<' 2>&1` assert_equal o, "-e:1:2: syntax error, unexpected tLSHFT\n" @@ -6,8 +8,9 @@ assert('regression for #1564') do end assert('regression for #1572') do - system "echo 'p \"ok\"' > /tmp/1572.rb" - system "bin/mrbc -g -o /tmp/1572.mrb /tmp/1572.rb" - o = `bin/mruby -b /tmp/1572.mrb`.strip + script, bin = Tempfile.new('test.rb'), Tempfile.new('test.mrb') + system "echo 'p \"ok\"' > #{script.path}" + system "bin/mrbc -g -o #{bin.path} #{script.path}" + o = `bin/mruby -b #{bin.path}`.strip assert_equal o, '"ok"' end -- cgit v1.2.3