summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2010-12-29 21:43:45 +0000
committerKeri Harris <keri@gentoo.org>2010-12-29 21:43:45 +0000
commit78eea3b2e3437d4816c50c051080b1dc47854b75 (patch)
tree84fab12f2801213e0bdb74593a2671b62b1cbdc9 /dev-lang/mercury
parentarm stable, bug #344827 (diff)
downloadgentoo-2-78eea3b2e3437d4816c50c051080b1dc47854b75.tar.gz
gentoo-2-78eea3b2e3437d4816c50c051080b1dc47854b75.tar.bz2
gentoo-2-78eea3b2e3437d4816c50c051080b1dc47854b75.zip
Run tests in C locale since output is compared against hard-coded errors/warnings. Closes #350030
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/mercury')
-rw-r--r--dev-lang/mercury/ChangeLog6
-rw-r--r--dev-lang/mercury/mercury-10.04.2-r1.ebuild5
2 files changed, 9 insertions, 2 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/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}" \