From ff5c103f7946c6f5bdedabeaaa4cc71ed1ca7abf Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sun, 29 Jul 2018 10:24:25 +0200 Subject: [PATCH] dev-ruby/rspec-core: fix test failure Avoid circular test dependency on dev-ruby/rspec itself. Fixes: https://bugs.gentoo.org/662328 Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- dev-ruby/rspec-core/rspec-core-3.6.0.ebuild | 4 ++++ dev-ruby/rspec-core/rspec-core-3.7.1.ebuild | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild index 48ff83c8d11d..09fe88a7d48a 100644 --- a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild +++ b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild @@ -71,6 +71,10 @@ all_ruby_prepare() { sed -i -e '/be_highlighted/,/end/ s/32/33/' \ -e '/highlights core RSpec keyword-like methods/,/^ end/ s:^:#:' \ spec/rspec/core/formatters/syntax_highlighter_spec.rb || die + + # Avoid a spec that depens on dev-ruby/rspec to lessen circular + # dependencies, bug 662328 + sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die } each_ruby_prepare() { diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild index 2d053a7ba98a..78b1560ac9ae 100644 --- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild +++ b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild @@ -71,6 +71,10 @@ all_ruby_prepare() { sed -i -e '/be_highlighted/,/end/ s/32/33/' \ -e '/highlights core RSpec keyword-like methods/,/^ end/ s:^:#:' \ spec/rspec/core/formatters/syntax_highlighter_spec.rb || die + + # Avoid a spec that depens on dev-ruby/rspec to lessen circular + # dependencies, bug 662328 + sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die } each_ruby_prepare() { -- 2.26.2