diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-06-26 13:50:56 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-06-26 13:50:56 +0000 |
| commit | 83adac1f532098cbdd085a81cc7b2a7c88e5ff14 (patch) | |
| tree | a8dbadf9ad13904dae5a0b314dba6ab634a5d41b /dev-ruby | |
| parent | ppc stable #317567 (diff) | |
| download | gentoo-2-83adac1f532098cbdd085a81cc7b2a7c88e5ff14.tar.gz gentoo-2-83adac1f532098cbdd085a81cc7b2a7c88e5ff14.tar.bz2 gentoo-2-83adac1f532098cbdd085a81cc7b2a7c88e5ff14.zip | |
Make sure tests work regardless of load order.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/builder/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ruby/builder/builder-2.1.2-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-ruby/builder/builder-2.1.2-r2.ebuild | 3 | ||||
| -rw-r--r-- | dev-ruby/builder/files/builder-2.1.2-fix-tests.patch | 12 |
4 files changed, 21 insertions, 3 deletions
diff --git a/dev-ruby/builder/ChangeLog b/dev-ruby/builder/ChangeLog index 3faec108dbf0..b8cd00fb45ea 100644 --- a/dev-ruby/builder/ChangeLog +++ b/dev-ruby/builder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/builder # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.43 2010/06/14 19:22:38 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.44 2010/06/26 13:50:56 graaff Exp $ + + 26 Jun 2010; Hans de Graaff <graaff@gentoo.org> builder-2.1.2-r1.ebuild, + builder-2.1.2-r2.ebuild, +files/builder-2.1.2-fix-tests.patch: + Make sure tests work regardless of load order. 14 Jun 2010; Hans de Graaff <graaff@gentoo.org> +builder-2.1.2-r1.ebuild, builder-2.1.2-r2.ebuild: diff --git a/dev-ruby/builder/builder-2.1.2-r1.ebuild b/dev-ruby/builder/builder-2.1.2-r1.ebuild index cfaceb6a69d7..a8afa93f11e4 100644 --- a/dev-ruby/builder/builder-2.1.2-r1.ebuild +++ b/dev-ruby/builder/builder-2.1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r1.ebuild,v 1.11 2010/06/14 19:22:38 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r1.ebuild,v 1.12 2010/06/26 13:50:56 graaff Exp $ EAPI=2 USE_RUBY="ruby18 jruby" @@ -27,4 +27,5 @@ all_ruby_prepare() { sed -i -e '/rdoc\.template .*jamis/d' Rakefile || die epatch "${FILESDIR}"/${P}-activesupport.patch + epatch "${FILESDIR}"/${P}-fix-tests.patch } diff --git a/dev-ruby/builder/builder-2.1.2-r2.ebuild b/dev-ruby/builder/builder-2.1.2-r2.ebuild index 9597b2487c05..fe5f8ac4f6e5 100644 --- a/dev-ruby/builder/builder-2.1.2-r2.ebuild +++ b/dev-ruby/builder/builder-2.1.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r2.ebuild,v 1.2 2010/06/10 03:20:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r2.ebuild,v 1.3 2010/06/26 13:50:56 graaff Exp $ EAPI=2 USE_RUBY="ruby18 ree18 jruby" @@ -27,4 +27,5 @@ all_ruby_prepare() { sed -i -e '/rdoc\.template .*jamis/d' Rakefile || die epatch "${FILESDIR}"/${P}-activesupport.patch + epatch "${FILESDIR}"/${P}-fix-tests.patch } diff --git a/dev-ruby/builder/files/builder-2.1.2-fix-tests.patch b/dev-ruby/builder/files/builder-2.1.2-fix-tests.patch new file mode 100644 index 000000000000..c58b1a6774d0 --- /dev/null +++ b/dev-ruby/builder/files/builder-2.1.2-fix-tests.patch @@ -0,0 +1,12 @@ +Require the needed files explicitly. Otherwise tests might break if this +test is found first. + +--- test/testeventbuilder.rb.~1~ 2006-12-24 20:29:01.000000000 +0100 ++++ test/testeventbuilder.rb 2010-06-26 15:43:50.853708583 +0200 +@@ -1,3 +1,6 @@ ++require 'test/unit' ++require 'builder' ++ + class TestEvents < Test::Unit::TestCase + + class Target |