Rakefile in sq_mini_racer-0.2.5.0.2 vs Rakefile in sq_mini_racer-0.3.1.0.0

@@ -1,76 +1,58 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rake/extensiontask"
+require "shellwords"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
-end
+class ValgrindTestTask < Rake::TestTask
+  VALGRIND_EXEC = 'valgrind'
+  DEFAULT_VALGRIND_OPTS = %w{
+    --trace-children=yes
+    --partial-loads-ok=yes
+    --error-limit=no
+    --error-exitcode=33
+    --num-callers=100
+    --suppressions=valgrind.supp
+    --gen-suppressions=all
+  }
 
-task :default => [:compile, :test]
+  attr_accessor :valgrind_args
 
-gem = Gem::Specification.load( File.dirname(__FILE__) + '/sq_mini_racer.gemspec' )
-Rake::ExtensionTask.new( 'mini_racer_extension', gem ) do |ext|
-  ext.name = 'sq_mini_racer_extension'
-end
-Rake::ExtensionTask.new('prv_ext_loader', gem)
+  def initialize(name=:valgrind_test)
+    @valgrind_args = DEFAULT_VALGRIND_OPTS
+    super
+  end
 
-
-# via http://blog.flavorjon.es/2009/06/easily-valgrind-gdb-your-ruby-c.html
-namespace :test do
-  desc "run test suite with Address Sanitizer"
-  task :asan do
-    ENV["CONFIGURE_ARGS"] = [ENV["CONFIGURE_ARGS"], '--enable-asan'].compact.join(' ')
-    Rake::Task['compile'].invoke
-
-    asan_path = `ldconfig -N -p |grep libasan | grep -v 32 | sed 's/.* => \\(.*\\)$/\\1/'`.chomp.split("\n")[-1]
-
-
-    cmdline = "env LD_PRELOAD=\"#{asan_path}\" ruby test/test_leak.rb"
-    puts cmdline
-    system cmdline
-
-    cmdline = "env LD_PRELOAD=\"#{asan_path}\" rake test"
-    puts cmdline
-    system cmdline
+  # see original def in fileutils.rb
+  def ruby(*args, &block)
+    options = (Hash === args.last) ? args.pop : {}
+    if args.length > 1
+      sh(*([VALGRIND_EXEC] + valgrind_args + [RUBY] + args + [options]), &block)
+    else
+      # if the size is 1 it's assumed the arguments are already escaped
+      non_escaped_args = [VALGRIND_EXEC] + valgrind_args + [RUBY]
+      sh("#{non_escaped_args.map { |s| Shellwords.escape(s) }.join(' ')} #{args.first}", options, &block)
   end
-  # partial-loads-ok and undef-value-errors necessary to ignore
-  # spurious (and eminently ignorable) warnings from the ruby
-  # interpreter
-  VALGRIND_BASIC_OPTS = "--num-callers=50 --error-limit=no \
-                         --partial-loads-ok=yes --undef-value-errors=no"
+  end
+end
 
-  desc "run test suite under valgrind with basic ruby options"
-  task :valgrind => :compile do
-    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} ruby test/test_leak.rb"
-    puts cmdline
-    system cmdline
+test_task_cfg = Proc.new do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
   end
 
-  desc "run test suite under valgrind with leak-check=full"
-  task :valgrind_leak_check => :compile do
-    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} --leak-check=full ruby test/test_leak.rb"
-    puts cmdline
-    require 'open3'
-    _, stderr = Open3.capture3(cmdline)
+Rake::TestTask.new(:test, &test_task_cfg)
+ValgrindTestTask.new(:'test:valgrind', &test_task_cfg)
 
-    section = ""
-    stderr.split("\n").each do |line|
+task :default => [:compile, :test]
 
-      if line =~ /==.*==\s*$/
-        if (section =~ /mini_racer|SUMMARY/)
-          puts
-          puts section
-          puts
-        end
-        section = ""
-      else
-        section << line << "\n"
-      end
-    end
-  end
+gem = Gem::Specification.load( File.dirname(__FILE__) + '/mini_racer.gemspec' )
+Rake::ExtensionTask.new( 'mini_racer_loader', gem ) do |ext|
+  ext.name = 'sq_mini_racer_loader'
+end
+Rake::ExtensionTask.new( 'mini_racer_extension', gem ) do |ext|
+  ext.name = 'sq_mini_racer_extension'
 end
 
 desc 'run clang-tidy linter on mini_racer_extension.cc'
 task :lint do
   require 'mkmf'