diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-12-29 21:43:45 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-12-29 21:43:45 +0000 |
| commit | 100ad9d16a9bdd25592c78ca9f343a71c345b75b (patch) | |
| tree | 91138236158b226b6700994af5b162d8df66704b | |
| parent | Improving python related code, patch thanks to Arfrever Frehtes Taifersar Ara... (diff) | |
| download | historical-100ad9d16a9bdd25592c78ca9f343a71c345b75b.tar.gz historical-100ad9d16a9bdd25592c78ca9f343a71c345b75b.tar.bz2 historical-100ad9d16a9bdd25592c78ca9f343a71c345b75b.zip | |
Run tests in C locale since output is compared against hard-coded errors/warnings. Closes #350030
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mercury/Manifest | 14 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-10.04.2-r1.ebuild | 5 |
3 files changed, 11 insertions, 14 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index acbf410b5eb6..2a779e381bc2 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.130 2010/12/22 11:50:09 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.131 2010/12/29 21:43:45 keri Exp $ + + 29 Dec 2010; <keri@gentoo.org> mercury-10.04.2-r1.ebuild: + Run tests in C locale since output is compared against hard-coded + errors/warnings. Closes #350030 22 Dec 2010; Markos Chandras <hwoarang@gentoo.org> mercury-10.04.2-r1.ebuild: Stable on amd64 wrt bug #346451 diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 5a575ad017d1..29b29a76805a 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 50mercury-gentoo.el 130 RMD160 293a39103c84059a611896e552d89736ee742789 SHA1 ea6071d0be2885090f90211ffca5474ad50b2286 SHA256 802dbbd82d775bba22bb750668e0a8462960d9e8b28e3731171cded00783d6f4 AUX mercury-0.13.1-docs.patch 796 RMD160 842e415a6c97d910e77e7179ab9b3f7d6447827c SHA1 4abd392a9f8030c87c3be7e7a183deaa61966e74 SHA256 c5e3ff95f34e8822bafc54d511a1f5f710ba485cffb661fccac163daf73ea6c2 AUX mercury-0.13.1-libgrades.patch 13854 RMD160 0f4dd4b97390962524944e3e57ce8d5b405967ed SHA1 8f5bdb0c367cb94aea0eae0dd15bddd164003cf1 SHA256 207d9af7c741845c1b0fcc098413952f8b002f4f71803fb38e474c63118d578f @@ -27,15 +24,8 @@ DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01 EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44 EBUILD mercury-10.04-r1.ebuild 4058 RMD160 045040097513847a6959ef40121d8e6b81e6ae85 SHA1 f8746e3d5b738c5ed0079be878cb11393dfd96ca SHA256 ceb6d53b6f96c42b38e4bfbfee8f8dc71c098bb48aa13b4046d9264b9653641b EBUILD mercury-10.04.1.ebuild 4529 RMD160 91e2a1ddf874123394ae90431608525ae0a26f6c SHA1 273b09516ff839983613fbd526f6a7d12b2536c9 SHA256 8ae2505b6e5bcd624692c29cdba4963a8931b5e1b87ef4e5ac0b21a0a19e52eb -EBUILD mercury-10.04.2-r1.ebuild 5662 RMD160 c4ebeeda8a9f7668971fc144d9750f51aa59db7d SHA1 8394071ac7047913d7afa1f835786fc03dcc8f6c SHA256 5c22b8032aa877d216f2391146d97703573f7677949c5821f0b04e4b21a3fc2f +EBUILD mercury-10.04.2-r1.ebuild 5779 RMD160 e9051bd1565a1888657cd03182ba1cfe9843c021 SHA1 6cdc8fbfab1e19470326dc5d0a8c3a1db6f9fa88 SHA256 7dda796b54ff895f34026a40468013d15f0151d7157904b4a4e199a600879697 EBUILD mercury-10.04.2.ebuild 4529 RMD160 43477f989449a2fe794afb35df94855175bb7a0a SHA1 1e14fef6fbabaf466ca0237286978b281f0a2aee SHA256 e5ca10919d13cf82701d98a5a3acdf4c495238842d4b65eed87064a5ef86983a EBUILD mercury-10.04.ebuild 3857 RMD160 d9bb8e9e002d2f50b384c24733d64c6a02f7e4f6 SHA1 70aae9ae137fb35dacdcaf3541ec78b5f4c1ddaa SHA256 0133dfea517707ff1d1d2e9275a6051be07911d9b374cc91016ee166a94b5f20 -MISC ChangeLog 28405 RMD160 f79947c7de75d60735d7f36cfe5592c8a7f6e797 SHA1 b33e08095d845bce95ce182a61355eff8854b759 SHA256 a5c26e25bc82b817514c0a160b55e41a9756bb6b8a71a6e03c73879deee95961 +MISC ChangeLog 28564 RMD160 86d97e5e7daf0831416dd61f0a184ab7bfbf626e SHA1 3dba0f85170de04706e276ab7d541fb8f45968f4 SHA256 f5537de8fd8610ea18bb5bc8a065347370c2d2164ae145d4fef0424c628d1f34 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAk0R83MACgkQ9/cejkQaxBAdRwCeI+jibjwO376HvP2dK9R9yv3h -WWkAnj4GyksiYQ/4b6dp2dPGVM4pa74h -=0H// ------END PGP SIGNATURE----- diff --git a/dev-lang/mercury/mercury-10.04.2-r1.ebuild b/dev-lang/mercury/mercury-10.04.2-r1.ebuild index 3c0d3b7851d3..0a94acdcf1f0 100644 --- a/dev-lang/mercury/mercury-10.04.2-r1.ebuild +++ b/dev-lang/mercury/mercury-10.04.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-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.8 2010/12/22 11:50:09 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.9 2010/12/29 21:43:45 keri Exp $ inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib @@ -133,6 +133,9 @@ src_test() { sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \ || die "sed WORKSPACE failed" + # Mercury tests must be run in C locale since Mercury output is + # compared to hard-coded warnings/errors + LC_ALL="C" \ PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \ TERM="" \ WORKSPACE="${TWS}" \ |