From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2AFC7138334 for ; Sun, 29 Jul 2018 08:24:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11936E082F; Sun, 29 Jul 2018 08:24:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3F42E082F for ; Sun, 29 Jul 2018 08:24:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3138335CA7 for ; Sun, 29 Jul 2018 08:24:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A6E5375 for ; Sun, 29 Jul 2018 08:24:41 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1532852665.ff5c103f7946c6f5bdedabeaaa4cc71ed1ca7abf.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rspec-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/rspec-core/rspec-core-3.6.0.ebuild dev-ruby/rspec-core/rspec-core-3.7.1.ebuild X-VCS-Directories: dev-ruby/rspec-core/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: ff5c103f7946c6f5bdedabeaaa4cc71ed1ca7abf X-VCS-Branch: master Date: Sun, 29 Jul 2018 08:24:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bd91a427-4ea2-41a6-8c5a-99036267f964 X-Archives-Hash: 3e475e8df6a957e0a700a2becfc18558 commit: ff5c103f7946c6f5bdedabeaaa4cc71ed1ca7abf Author: Hans de Graaff gentoo org> AuthorDate: Sun Jul 29 08:24:25 2018 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun Jul 29 08:24:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5c103f 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 48ff83c8d11..09fe88a7d48 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 2d053a7ba98..78b1560ac9a 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() {