diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2011-10-10 18:48:23 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2011-10-10 18:48:23 +0000 |
| commit | 9c8de8719bc7732b1b371e883dced8987b6739f8 (patch) | |
| tree | 3847283bc867e769ebf1b42bfcd92e45d820a237 /dev-ruby/json | |
| parent | Marked ~{amd64,x86}-linux, bug #385065 (diff) | |
| download | historical-9c8de8719bc7732b1b371e883dced8987b6739f8.tar.gz historical-9c8de8719bc7732b1b371e883dced8987b6739f8.tar.bz2 historical-9c8de8719bc7732b1b371e883dced8987b6739f8.zip | |
Call tests directly instead of via testrb to address bug 339126.
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/json')
| -rw-r--r-- | dev-ruby/json/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-ruby/json/Manifest | 10 | ||||
| -rw-r--r-- | dev-ruby/json/json-1.5.4.ebuild | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog index be0357a29164..b302b7b7b5de 100644 --- a/dev-ruby/json/ChangeLog +++ b/dev-ruby/json/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/json # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.66 2011/09/11 06:05:13 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.67 2011/10/10 18:48:23 graaff Exp $ + + 10 Oct 2011; Hans de Graaff <graaff@gentoo.org> json-1.5.4.ebuild: + Call tests directly instead of via testrb to address bug 339126. *json-1.5.4 (11 Sep 2011) diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest index e7af17cca534..3da7b67835e3 100644 --- a/dev-ruby/json/Manifest +++ b/dev-ruby/json/Manifest @@ -6,13 +6,13 @@ DIST json-1.5.3.gem 675328 RMD160 c9687e4554bb1146db3f1a04131c638d32a1f34c SHA1 DIST json-1.5.4.gem 678912 RMD160 c1fc66f466efbeedf2cd741fb3b9b9d2da6b9281 SHA1 f67c848af3014c986017baf1ffe07cc855a16f48 SHA256 3acf6c344e5f9089b6e4d675d18384bb61a36c81d038ce9a65906987711c789e EBUILD json-1.4.6.ebuild 1721 RMD160 412cb6fca8466187ae5dd5415e82145f37be1624 SHA1 52226fc2cd6ccbc7d17d9b8753a03067be54b788 SHA256 2dd071cd2b66f6094f6319efca9d84ea01ca4fc0d3855138db4b7631232634b9 EBUILD json-1.5.3.ebuild 1833 RMD160 d6930aa0e9312f790a3c077edc04f576a0ac857d SHA1 0a2c9dc1ee5483d4a3a158116f9a5991fde0af33 SHA256 aa73c5b5da73ea0c3731b62f32b07e42ef6e73e0a150d5e19dd5ffa49fa9f408 -EBUILD json-1.5.4.ebuild 1831 RMD160 ee87d837879ab129ecd563b91ee9f7138a3aa74a SHA1 fc68f8136c76a23f08530d68b18a32b8f680d10a SHA256 5011dc17001b52e0bb76d08765d59041d1ee7327958142e5310abb569f18cf03 -MISC ChangeLog 8997 RMD160 e488aa6ebe0d6b8ce628b43c1be3fadd8027f19e SHA1 a5e2a73f68deb1ca67a29dc599c063d4456b8274 SHA256 992052c518c18902ac1bc9de471ff13e8bb1bcd8cd034fd2d798288d4e111024 +EBUILD json-1.5.4.ebuild 1897 RMD160 bc737eef3bfbc3260a018aa1fec13a61bda31174 SHA1 631384cd1c61934fa5a2193a5f10b44d63f3b134 SHA256 faf7cf0c83954b2f5a23fbbc578a4e1e629f1c7fed97ad4f82745c3ba783f4ae +MISC ChangeLog 9134 RMD160 b212745ce32d3aec73c64b8da7757c076281f423 SHA1 a30cbfc0da394e223af4328c2ef788a21004c461 SHA256 1566cc823a8f305bed512913874346ef71c10e1be90a0cc9a7b660eb2bc6c4fd MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk5sT54ACgkQiIP6VqMIqNdxLAD/UfdTDwjmdPuHrXpzLLpm2QEp -8RBCyZbaAFEUTjXmGngA/1q/m64IxoidM29vlbUyfH6YZamEcj9mxRB1Wgojcj8K -=LiIN +iF4EAREIAAYFAk6TPgMACgkQiIP6VqMIqNdYCQD/S+cI8JGiV2lMU1D88uYxcVl0 +7/O6szZJ78zE45l4Br8A/2JSzHRgfVBqRNXK35gKqdknCtnwGSPfLaClh5spg1GV +=m1Gz -----END PGP SIGNATURE----- diff --git a/dev-ruby/json/json-1.5.4.ebuild b/dev-ruby/json/json-1.5.4.ebuild index ae874b93bdbf..6ba22c8e928f 100644 --- a/dev-ruby/json/json-1.5.4.ebuild +++ b/dev-ruby/json/json-1.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.5.4.ebuild,v 1.1 2011/09/11 06:05:13 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.5.4.ebuild,v 1.2 2011/10/10 18:48:23 graaff Exp $ EAPI=2 USE_RUBY="ruby18 ree18 ruby19 jruby" @@ -45,11 +45,11 @@ each_ruby_compile() { each_ruby_test() { JSON=pure \ - ${RUBY} -Iext:lib -S testrb tests/*.rb || die "pure ruby tests failed" + ${RUBY} -Iext:lib -rtest/unit -e "Dir['test/*.rb'].each{|f| require f}" || die "pure ruby tests failed" if [[ $(basename ${RUBY}) != "jruby" ]]; then JSON=ext \ - ${RUBY} -Iext:lib -S testrb tests/*.rb || die "ext ruby tests failed" + ${RUBY} -Iext:lib -rtest/unit -e "Dir['test/*.rb'].each{|f| require f}" || die "ext ruby tests failed" fi } |