diff options
author | 2014-10-28 18:08:35 +0000 | |
---|---|---|
committer | 2014-10-28 18:08:35 +0000 | |
commit | 0b76a014211780511ec90dd8db1d1c137721eb0e (patch) | |
tree | bb01203ff59dda9491cf4706930ab154bc7da5b0 /dev-ruby/rubyzip | |
parent | Fix tests with LANG=C, bug 527234. (diff) | |
download | gentoo-2-0b76a014211780511ec90dd8db1d1c137721eb0e.tar.gz gentoo-2-0b76a014211780511ec90dd8db1d1c137721eb0e.tar.bz2 gentoo-2-0b76a014211780511ec90dd8db1d1c137721eb0e.zip |
Fix test failures due to random ordering of tests with newer minitest, bug 527266.
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby/rubyzip')
-rw-r--r-- | dev-ruby/rubyzip/ChangeLog | 6 | ||||
-rw-r--r-- | dev-ruby/rubyzip/rubyzip-1.1.3.ebuild | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/dev-ruby/rubyzip/ChangeLog b/dev-ruby/rubyzip/ChangeLog index faa08462accf..d51612e08d3b 100644 --- a/dev-ruby/rubyzip/ChangeLog +++ b/dev-ruby/rubyzip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/rubyzip # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyzip/ChangeLog,v 1.40 2014/08/05 15:50:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyzip/ChangeLog,v 1.41 2014/10/28 18:08:35 graaff Exp $ + + 28 Oct 2014; Hans de Graaff <graaff@gentoo.org> rubyzip-1.1.3.ebuild: + Fix test failures due to random ordering of tests with newer minitest, bug + 527266. 05 Aug 2014; Raúl Porcel <armin76@gentoo.org> rubyzip-0.9.9.ebuild: sparc stable, bug #505100 diff --git a/dev-ruby/rubyzip/rubyzip-1.1.3.ebuild b/dev-ruby/rubyzip/rubyzip-1.1.3.ebuild index 5f0f13a3405a..14aabf9dbcf9 100644 --- a/dev-ruby/rubyzip/rubyzip-1.1.3.ebuild +++ b/dev-ruby/rubyzip/rubyzip-1.1.3.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyzip/rubyzip-1.1.3.ebuild,v 1.2 2014/06/15 14:12:00 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyzip/rubyzip-1.1.3.ebuild,v 1.3 2014/10/28 18:08:35 graaff Exp $ EAPI=5 -# jruby → adding zip files to the load path fails, badly USE_RUBY="ruby19 ruby20 ruby21" RUBY_FAKEGEM_TASK_DOC="" @@ -25,6 +24,8 @@ IUSE="" RDEPEND="" DEPEND="${DEPEND} test? ( app-arch/zip )" +ruby_add_bdepend "test? ( dev-ruby/minitest:0 )" + all_ruby_install() { all_fakegem_install @@ -38,4 +39,8 @@ all_ruby_prepare() { # Avoid dependency on bundler sed -i -e '/bundler/ s:^:#:' Rakefile || die + + # rubyzip's tests will fail when run in random order, so require a + # minitest version that still preserves ordering. + sed -i -e '2igem "minitest", "~> 4.0"' test/test_helper.rb || die } |