| 1 |
commit: ff5c103f7946c6f5bdedabeaaa4cc71ed1ca7abf |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 29 08:24:25 2018 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 29 08:24:25 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5c103f |
| 7 |
|
| 8 |
dev-ruby/rspec-core: fix test failure |
| 9 |
|
| 10 |
Avoid circular test dependency on dev-ruby/rspec itself. |
| 11 |
|
| 12 |
Fixes: https://bugs.gentoo.org/662328 |
| 13 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 14 |
|
| 15 |
dev-ruby/rspec-core/rspec-core-3.6.0.ebuild | 4 ++++ |
| 16 |
dev-ruby/rspec-core/rspec-core-3.7.1.ebuild | 4 ++++ |
| 17 |
2 files changed, 8 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild |
| 20 |
index 48ff83c8d11..09fe88a7d48 100644 |
| 21 |
--- a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild |
| 22 |
+++ b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild |
| 23 |
@@ -71,6 +71,10 @@ all_ruby_prepare() { |
| 24 |
sed -i -e '/be_highlighted/,/end/ s/32/33/' \ |
| 25 |
-e '/highlights core RSpec keyword-like methods/,/^ end/ s:^:#:' \ |
| 26 |
spec/rspec/core/formatters/syntax_highlighter_spec.rb || die |
| 27 |
+ |
| 28 |
+ # Avoid a spec that depens on dev-ruby/rspec to lessen circular |
| 29 |
+ # dependencies, bug 662328 |
| 30 |
+ sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die |
| 31 |
} |
| 32 |
|
| 33 |
each_ruby_prepare() { |
| 34 |
|
| 35 |
diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild |
| 36 |
index 2d053a7ba98..78b1560ac9a 100644 |
| 37 |
--- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild |
| 38 |
+++ b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild |
| 39 |
@@ -71,6 +71,10 @@ all_ruby_prepare() { |
| 40 |
sed -i -e '/be_highlighted/,/end/ s/32/33/' \ |
| 41 |
-e '/highlights core RSpec keyword-like methods/,/^ end/ s:^:#:' \ |
| 42 |
spec/rspec/core/formatters/syntax_highlighter_spec.rb || die |
| 43 |
+ |
| 44 |
+ # Avoid a spec that depens on dev-ruby/rspec to lessen circular |
| 45 |
+ # dependencies, bug 662328 |
| 46 |
+ sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die |
| 47 |
} |
| 48 |
|
| 49 |
each_ruby_prepare() { |
Archives