[gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-9999.ebuild chromium-10.0.612.1-r1.ebuild

[PaweA Hajdan (phajdan.jr)]

phajdan.jr    11/01/02 15:31:35

  Modified:             ChangeLog chromium-9999.ebuild
                        chromium-10.0.612.1-r1.ebuild
  Log:
  Fix locale-sensitive test failures, bug #350349.
  
  (Portage version: 2.1.9.25/cvs/Linux i686)

Revision  Changes    Path
1.249                www-client/chromium/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.249&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.249&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.248&r2=1.249

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- ChangeLog	22 Dec 2010 11:51:41 -0000	1.248
+++ ChangeLog	2 Jan 2011 15:31:35 -0000	1.249
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.248 2010/12/22 11:51:41 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.249 2011/01/02 15:31:35 phajdan.jr Exp $
+
+  02 Jan 2011; Pawel Hajdan jr <phajdan.jr@g.o>
+  chromium-10.0.612.1-r1.ebuild, chromium-9999.ebuild:
+  Fix locale-sensitive test failures, bug #350349.
 
 *chromium-10.0.612.1-r1 (22 Dec 2010)
 



1.119                www-client/chromium/chromium-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.119&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.119&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.118&r2=1.119

Index: chromium-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- chromium-9999.ebuild	22 Dec 2010 11:51:41 -0000	1.118
+++ chromium-9999.ebuild	2 Jan 2011 15:31:35 -0000	1.119
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.118 2010/12/22 11:51:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.119 2011/01/02 15:31:35 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -330,10 +330,20 @@
 }
 
 src_test() {
+	# For more info see bug #350349.
+	local mylocale='en_US.utf8'
+	if ! locale -a | grep -q "$mylocale"; then
+		eerror "${PN} requires ${mylocale} locale for tests"
+		eerror "Please read the following guides for more information:"
+		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
+		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
+		die "locale ${mylocale} is not supported"
+	fi
+
 	# Make test failures non-fatal for now. This needs more investigation.
-	maketype=out/Release/base_unittests virtualmake \
+	LC_ALL="${mylocale}" maketype=out/Release/base_unittests virtualmake \
 		|| eerror "base_unittests failed"
-	maketype=out/Release/net_unittests virtualmake \
+	LC_ALL="${mylocale}" maketype=out/Release/net_unittests virtualmake \
 		|| eerror "net_unittests failed"
 }
 



1.2                  www-client/chromium/chromium-10.0.612.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-10.0.612.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-10.0.612.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-10.0.612.1-r1.ebuild?r1=1.1&r2=1.2

Index: chromium-10.0.612.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.612.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chromium-10.0.612.1-r1.ebuild	22 Dec 2010 11:51:41 -0000	1.1
+++ chromium-10.0.612.1-r1.ebuild	2 Jan 2011 15:31:35 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.612.1-r1.ebuild,v 1.1 2010/12/22 11:51:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.612.1-r1.ebuild,v 1.2 2011/01/02 15:31:35 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -287,10 +287,20 @@
 }
 
 src_test() {
+	# For more info see bug #350349.
+	local mylocale='en_US.utf8'
+	if ! locale -a | grep -q "$mylocale"; then
+		eerror "${PN} requires ${mylocale} locale for tests"
+		eerror "Please read the following guides for more information:"
+		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
+		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
+		die "locale ${mylocale} is not supported"
+	fi
+
 	# Make test failures non-fatal for now. This needs more investigation.
-	maketype=out/Release/base_unittests virtualmake \
+	LC_ALL="${mylocale}" maketype=out/Release/base_unittests virtualmake \
 		|| eerror "base_unittests failed"
-	maketype=out/Release/net_unittests virtualmake \
+	LC_ALL="${mylocale}" maketype=out/Release/net_unittests virtualmake \
 		|| eerror "net_unittests failed"
 }