[DRE-commits] [ruby-rspec] 22/25: various tweaks and tests

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch no_submodules
in repository ruby-rspec.

commit 8b4f7697858d3079630e6d9ae93ceae14bfd6ffa
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Mar 28 21:25:19 2015 +0100

    various tweaks and tests
---
 debian/ruby-tests.rb | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index 09dd3ef..c00f75c 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -3,12 +3,27 @@ require "yaml"
 # We are going to chdir in the so we need absolute paths for the libs
 $:.collect! { |p| p.start_with?('debian/') ? File.expand_path(p) : p }
 
-LIBS = %w{rspec-core rspec-expectations rspec-mocks}
+puts $LOAD_PATH
+
+libs = []
+
+%w{rspec spec-core rspec-expectations rspec-mocks rspec-support}.each do |x|
+  $LOAD_PATH.unshift File.expand_path("debian/ruby-#{x}/usr/lib/ruby/vendor_ruby")
+  libs << File.expand_path("debian/ruby-#{x}/usr/lib/ruby/vendor_ruby")
+end
+
+puts "-----"
+puts $LOAD_PATH
+
+LIBS = %w{rspec-core rspec-expectations rspec-mocks rspec-support}
 
 EXC_TESTS = [
   # require 'syntax' gem
   'spec/rspec/core/formatters/text_mate_formatter_spec.rb',
-  'spec/rspec/core/formatters/html_formatter_spec.rb'
+  'spec/rspec/core/formatters/html_formatter_spec.rb',
+  # require 'aruba' gem, which depends on ruby-rspec-expectations
+  #'rspec-core/spec/integration/filtering_spec.rb',
+  #'rspec-core/spec/integration/order_spec.rb',
 ]
 
 success=true
@@ -17,7 +32,11 @@ LIBS.each do |lib|
   fork do
     Dir.chdir(lib) do
       require "rspec/core"
-      exit(RSpec::Core::Runner.run(Dir["spec/rspec/**/*_spec.rb"] - EXC_TESTS, $stderr, $stdout))
+
+      RSpec.configure do |c|
+        c.libs= libs
+      end
+      exit(RSpec::Core::Runner.run( Dir["spec/rspec/**/*_spec.rb"] - EXC_TESTS + ["-I#{libs.join(':')}"], $stderr, $stdout))
     end
   end
   Process.wait

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rspec.git