Exclude test that relies on custom ICU patches (bug #350347). Also remove net_unittests for now and make all test failures fatal.

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 19 insertions, 20 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 09a1cff69bd0..0e235ee44184 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.255 2011/01/07 08:28:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.256 2011/01/09 15:52:29 phajdan.jr Exp $
+
+  09 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-10.0.628.0.ebuild, chromium-9999.ebuild:
+  Exclude test that relies on custom ICU patches (bug #350347). Also remove
+  net_unittests for now and make all test failures fatal.
 
 *chromium-9.0.597.45 (07 Jan 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index dbfa07cb54ab..5aa54025ab7b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -18,10 +18,10 @@ DIST chromium-8.0.552.224.tar.bz2 135345394 RMD160 e7bed4bc0b4d851e83bfc351ceca9
 DIST chromium-9.0.597.44.tar.bz2 141943121 RMD160 0536ea24b5f40393989900d0109a5c3b7bf50ab9 SHA1 5b0b465bdf22c9fd64f8139af1d8ffd12f67b198 SHA256 ac03a34e6143bf66d3869e37d908177e96a0523918ba9330a14a5d4739c01c30
 DIST chromium-9.0.597.45.tar.bz2 141958182 RMD160 d2d006d61ea704252cdaa198a7624bd674ead942 SHA1 d011dec2ce9c3c88a417ded3400870eb79e947da SHA256 08a3282e0a69033848a1acc6f091528b5fceb31b3804cd4ba377e31b6fea7336
 EBUILD chromium-10.0.612.1-r1.ebuild 10784 RMD160 f3d9fc79812392c738a993b32e76def2d1029a1b SHA1 fd1c45b979cda406b39c1a136fc258309fcbe842 SHA256 172c86c8f646e078e95e8cfb964ca5bef9effac2e11684ccf74e282defeabc06
-EBUILD chromium-10.0.628.0.ebuild 10547 RMD160 a79d1779516ac3b39d199819dc902b5a983cefac SHA1 f5d041144535eff0862b3f7a2de6c61439d5a90c SHA256 965f7863caacb8bcdbff3d5246e5db9ef0cb545657eff60ede0b9bf3f00eed66
+EBUILD chromium-10.0.628.0.ebuild 10386 RMD160 9b37c5a5649d1f4ff1a72c9565ef838c04b9226f SHA1 8ea4ffa994a3f30cef8601196b1f412221ff92b0 SHA256 7ff190eef133f715d70ed51eec51972cf7ba0ee0e6bcd7a5ff43b72b1095c227
 EBUILD chromium-8.0.552.224.ebuild 8606 RMD160 da7aba06f58b5f00f49fa2b5377be60f986ea7b4 SHA1 3c7127b56601c7db9684d561fffed18ed1246fd4 SHA256 5b4ca0dcf464bd316fd5d8ea36f10a2553748d0df821eed8a026a03c5f0e943f
 EBUILD chromium-9.0.597.44.ebuild 9305 RMD160 791a327c54533213806655b081ec0be8f39b1f70 SHA1 8c66db48740c8be913b43bf85b323ab07397e315 SHA256 8c930d64e9574a20bb9bc06e32816e8551b48fcc5a2a88b95427418c235a415a
 EBUILD chromium-9.0.597.45.ebuild 9305 RMD160 0911dc68d0b5bd73da5c25714867d287f8e9c53d SHA1 cc0d6e42421a4be60d038a2657cf9570475e46a9 SHA256 ca5b912d704634fe7083141035265ed775a3bb30e16c0294cf0506b4d36a8af6
-EBUILD chromium-9999.ebuild 11990 RMD160 28fe1074012bbc6fade2c49982c5d0a3ae8e4ff1 SHA1 3e35b5688c115eab40f0491409f489d82fd24e4f SHA256 9a0f2b7c5ab98abc7fd1a40b17159d78312c569c7106f93f8c132532967df624
-MISC ChangeLog 56459 RMD160 9fde25e8f1ccd29ee7aa5a4095bc8a52da2552eb SHA1 6f27d58871c8aee64e397bd5c1f726e58159d8f4 SHA256 f7c211d2a6447b490aa170fca2cf4205cd86ee616024796754a103e23ac63f63
+EBUILD chromium-9999.ebuild 11829 RMD160 f724d758da83ab315f63dbd8896449a0e2d5a02e SHA1 bee75a332eab27aa5c2ce8d1f9b3a94b38967106 SHA256 2536ca0371c1818230bb6bbd1987afbf82cce3c2dc33ee6102a7d2b452b55ef6
+MISC ChangeLog 56701 RMD160 a7a7a8e6a5d185532b069e13da8bac3c953a6083 SHA1 09f22bd26b614de75a2a9446545e2ed861c4a943 SHA256 c05a0f5f0f5bf5e1512c7ee20cfe77e8fde1772358539dbd009b9e874114e040
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
diff --git a/www-client/chromium/chromium-10.0.628.0.ebuild b/www-client/chromium/chromium-10.0.628.0.ebuild
index 3bd3dfd83f41..b509dee1705d 100644
--- a/www-client/chromium/chromium-10.0.628.0.ebuild
+++ b/www-client/chromium/chromium-10.0.628.0.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/www-client/chromium/chromium-10.0.628.0.ebuild,v 1.1 2011/01/06 16:12:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.628.0.ebuild,v 1.2 2011/01/09 15:52:29 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -272,9 +272,8 @@ src_compile() {
 	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
 	pax-mark m out/Release/chrome
 	if use test; then
-		emake base_unittests net_unittests \
-			BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/{base_unittests,net_unittests}
+		emake base_unittests BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/base_unittests
 	fi
 }
 
@@ -289,11 +288,9 @@ src_test() {
 		die "locale ${mylocale} is not supported"
 	fi
 
-	# Make test failures non-fatal for now. This needs more investigation.
+	# For more info see bug #350347.
 	LC_ALL="${mylocale}" maketype=out/Release/base_unittests virtualmake \
-		|| eerror "base_unittests failed"
-	LC_ALL="${mylocale}" maketype=out/Release/net_unittests virtualmake \
-		|| eerror "net_unittests failed"
+		'--gtest_filter=-ICUStringConversionsTest.*' || die
 }
 
 src_install() {
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 41411ab09bce..0bc20e43fe69 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.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/www-client/chromium/chromium-9999.ebuild,v 1.121 2011/01/06 16:12:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.122 2011/01/09 15:52:29 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -309,9 +309,8 @@ src_compile() {
 	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
 	pax-mark m out/Release/chrome
 	if use test; then
-		emake base_unittests net_unittests \
-			BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/{base_unittests,net_unittests}
+		emake base_unittests BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/base_unittests
 	fi
 }
 
@@ -326,11 +325,9 @@ src_test() {
 		die "locale ${mylocale} is not supported"
 	fi
 
-	# Make test failures non-fatal for now. This needs more investigation.
+	# For more info see bug #350347.
 	LC_ALL="${mylocale}" maketype=out/Release/base_unittests virtualmake \
-		|| eerror "base_unittests failed"
-	LC_ALL="${mylocale}" maketype=out/Release/net_unittests virtualmake \
-		|| eerror "net_unittests failed"
+		'--gtest_filter=-ICUStringConversionsTest.*' || die
 }
 
 src_install() {