Use bash arrays so that comments about excluded tests can be inline.

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

4 files changed, 46 insertions, 31 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index a181b4707f9e..c8f7744f8052 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.692 2012/08/13 10:22:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.693 2012/08/16 09:58:08 phajdan.jr Exp $
+
+  16 Aug 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-22.0.1229.2-r1.ebuild, chromium-9999-r1.ebuild:
+  Use bash arrays so that comments about excluded tests can be inline.
 
   13 Aug 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-21.0.1180.57.ebuild, chromium-21.0.1180.77-r1.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ad2298be4a0a..394261541ecd 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -31,16 +31,17 @@ EBUILD chromium-21.0.1180.75.ebuild 13966 SHA256 b6e6fdc49a64245f54e90e53edf42e5
 EBUILD chromium-21.0.1180.77-r1.ebuild 14038 SHA256 642b406a8e248bd23ee305ef5b8b9cd69f77bd0027bb65ea8d80b0070e3ad9ef SHA512 8bebadae394d25098571e4a212ddf45316e574e3f2cdd026818ba01d640df5a80176b57d1037ccdb547a0c87be3498f6bb0421d3145c611dfd94f4bf858ba0d3 WHIRLPOOL 273b9383350e58d7cf44ac981f41d3c544006bae69c28ea9d73d92ab3260b9f6957c7051f133ce813745ce318bf9d5668167f9eab518b138263cfe4ede0e2201
 EBUILD chromium-21.0.1180.77.ebuild 13966 SHA256 49eac76a48a64ce5d9db1e2fc46eaf577e5cdc98633a4d8eec2cd6a5336fc6e7 SHA512 3a45c93411409ef83ebe7e56c92b973e66e2882c7955e0acf5678e9c18d1e5675c8991218f77697dd9a06ad248941422a55d6643b61e83d2f0cdac4f47ae00f5 WHIRLPOOL 212224800c0c7c9cb7157f70b0d2194e1bdc6077a63818f0a083af68e4be5085dc33598a6a977cca977aecf408cf89b62fc397e9ba642c90a0078056e1a892da
 EBUILD chromium-22.0.1229.0.ebuild 13833 SHA256 2e2d6e6dee71511cf3ddaf4c65450179bffe09832edaf0ed94f74a2e497a819c SHA512 60d638a752535b5c518a31f9c1a5256ff318d32fb9fb85eb08a1b6efd34874890879ac716cf0c88b7ed51d56e8a1f40eac09ed917e0c6b5774b469b7ac863fb2 WHIRLPOOL 7b3959b1253d8b4c5ed7b483551c9d196749baa11fce76924d2963a28c243c7c464c05f1319b306fc78bd6d9df5ce6dad00d8e0dd94274b1d1b99fe210ca87bf
-EBUILD chromium-22.0.1229.2-r1.ebuild 13902 SHA256 7337948cb77cfe9ad5a91a679781aff6ae85e35b3d8dc0bfddbee08df4504336 SHA512 932daf590034dc051e3be2af46305c1db4334a5e9ac7952a352f87fe5e9200cd10ae79bf0877a77b9b2a4953736cbf6f665c6af6de3910e900c3bb5c7f027c04 WHIRLPOOL f8fffeeb09b78d3739ab9b719f029e57bc0ab4f781b7b89559503c544e3d33f59c56c9be319632521c6dd29e6b09185e720501d0c9cb13d9c6c1832c4c346e42
+EBUILD chromium-22.0.1229.2-r1.ebuild 13935 SHA256 b879969d191306f7df4f0c457aac4db5652958f443266be3e03c18a3085e3955 SHA512 eb139172c60c825b70f9c8c1cb27c899f3c690bf5bcf2843d8ba2e6bd499d86288d526a525698a642386effe2e98c0ea2e90ca14c7b31603f32022253e98b4ff WHIRLPOOL 9b878815caef46bd5af09a81a48487ab297c1db1767977f988f18c4ea75f66a191870a09df32e7e0b1a68995a608e84c8deac4419706da7eb96366a8dc719d9c
 EBUILD chromium-22.0.1229.2.ebuild 13833 SHA256 d4bf762d5c6eddd960bb68d0db07e177f02c953de3adbc040f99bfc00eebf4c9 SHA512 ae27ffa4bd093103c9088afad84185925b90d43125f8c87889aea144af627f3bc06cc45484ac3ab2fddbcb78533af516d1d889f2aedd81981be11ebd529db134 WHIRLPOOL 7040a71be5ce95f88ca5549507aa0f44a152f6c06eeadfc3c82a9dc6b6d03ab2016aa5ed66f550289b61b4189b8616d54a362d8a8473245ae9d7db034bfd715d
-EBUILD chromium-9999-r1.ebuild 15465 SHA256 69336adda51809059acd3f652afa58af3b77ab5019eb128778098b0899a4f593 SHA512 3175d0140dba2a8dd7c9b10c699a41200c9689350dffdb67bfabc338bafa263af78f0069aa755d74afce597e64571dd051cd87ec65c7d1f30a41c12d2516eb6e WHIRLPOOL 4cbd1c7a85a7391176689139290bcca3bd39adaef3d0d7d6f0f3634bc6e35d58776f2818f2392b6d0158c6263db08b7694db4d70c14b4d5cd9834f3e95486d45
-MISC ChangeLog 32820 SHA256 7ddfc64d530fe12deeb149021db1b0df422e00ca31d293b985916dabf8c57e89 SHA512 fd2495c415a70bb1972c673158cb2fa13d758401d4593dd33b6056f6ea05fcd50d80ad1b25d8d958de3d8cd294aba4034a97d217dfc0ae0b7f122aa30f8435e4 WHIRLPOOL 61ded8a01eb4a0af492efff55aed7d5dcdf4b95b148c9e58a12fb8eac93868b08a9dcda33b4b436f81191436a3e486364f5bddae35db35c3f7d35f06f725adef
+EBUILD chromium-9999-r1.ebuild 15498 SHA256 99bd7507608bed69f1dde2917fbb7072c869f343ceab7630241456d82e3930c0 SHA512 03da4251005004ee1cae402b0436ae52820c61634f00759fa387aacfe5980fb46ec9330eec85cf0397e44858c84ea90b2f377dfd377f8cdeb8773a9d07bbe192 WHIRLPOOL 9e9ac5f98f72323fd459a7ae752357bac3580556fe6322cef3d33655866b1fa0f02316252c42399ee6ce52437180650bcb3484616e55d7c08b46ec366b8d8c5b
+MISC ChangeLog 33006 SHA256 6f901cbd942b937c8ab17b3a8814450872a167862d140040b4f75b9e20d0ea95 SHA512 b387edc4952f2aeb3251b5eb43715067e0f0b99dc461b9fab7bffb9e63f1f2fd9c0f6eeb684e3cf2b0aaa93f169f2d650ef161e1b01896f1418d1174b6b51988 WHIRLPOOL f5b9dddc40a37d42550dfe8f25a0a4f9cb2137e610a6b04ff8528a6ae2b5094d4d52bb22021e092bb1212fc91a9d14564a94cb096d4202413aefc172bc2d0821
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
+MISC chromium-9999-r1.ebuild.orig 15465 SHA256 69336adda51809059acd3f652afa58af3b77ab5019eb128778098b0899a4f593 SHA512 3175d0140dba2a8dd7c9b10c699a41200c9689350dffdb67bfabc338bafa263af78f0069aa755d74afce597e64571dd051cd87ec65c7d1f30a41c12d2516eb6e WHIRLPOOL 4cbd1c7a85a7391176689139290bcca3bd39adaef3d0d7d6f0f3634bc6e35d58776f2818f2392b6d0158c6263db08b7694db4d70c14b4d5cd9834f3e95486d45
 MISC metadata.xml 267 SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 SHA512 f6d64d50bfbfad74db0ca0454fcba335a1744d11a44f921f19545c478219c507994cfcaba13160215cbb5a77d0bc82cdbf64a90a4b1b169184e404e404f9029e WHIRLPOOL 66a5cdeac3a86b910040d4c601fef50465fb0e0a0805e6b1c22cde2a83a63a2a1d441643af5454775becdfc65c71116d00b27703a7dd15ced183fb223c32f075
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAo1aEACgkQuUQtlDBCeQLofQCeNSeZnbj+v0FnTnpsLFOM12xS
-d4AAn2yStyoeWnkyeTA+yIjQBT2r/VFq
-=tDiP
+iEYEAREIAAYFAlAsxD0ACgkQuUQtlDBCeQLOKwCcDBIhbVvuCjgtRac30c0ko/kD
+qd0An1d75xV09t0EPD09/g2qCCuYui1c
+=Sx07
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-22.0.1229.2-r1.ebuild b/www-client/chromium/chromium-22.0.1229.2-r1.ebuild
index f2f366c75bb0..e885405f10a7 100644
--- a/www-client/chromium/chromium-22.0.1229.2-r1.ebuild
+++ b/www-client/chromium/chromium-22.0.1229.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.2-r1.ebuild,v 1.2 2012/08/13 10:22:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.2-r1.ebuild,v 1.3 2012/08/16 09:58:08 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -331,14 +331,16 @@ src_test() {
 	runtest() {
 		local cmd=$1
 		shift
-		einfo "${cmd}" "$@"
-		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "$@"
+		local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
+		einfo "${cmd}" "${filter}"
+		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
 	}
 
-	# ICUStringConversionsTest: bug #350347.
-	# MessagePumpLibeventTest: bug #398501.
-	runtest out/Release/base_unittests \
-		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
+	local excluded_base_unittests=(
+		ICUStringConversionsTest.* # bug #350347
+		MessagePumpLibeventTest.* # bug #398591
+	)
+	runtest out/Release/base_unittests ${excluded_base_unittests[*]}
 
 	runtest out/Release/cacheinvalidation_unittests
 	runtest out/Release/crypto_unittests
@@ -346,11 +348,14 @@ src_test() {
 	runtest out/Release/gpu_unittests
 	runtest out/Release/media_unittests
 
-	# NetUtilTest: bug #361885.
-	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
-	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
-	runtest out/Release/net_unittests \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned:URLFetcher*'
+	local excluded_net_unittests=(
+		NetUtilTest.IDNToUnicode* # bug 361885
+		NetUtilTest.FormatUrl* # see above
+		DnsConfigServiceTest.GetSystemConfig # bug #394883
+		CertDatabaseNSSTest.ImportServerCert_SelfSigned # bug #399269
+		URLFetcher* # bug #425764
+	)
+	runtest out/Release/net_unittests ${excluded_net_unittests[*]}
 
 	runtest out/Release/printing_unittests
 	runtest out/Release/sql_unittests
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 983dba4b2e5e..2e69e9adfe3f 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.128 2012/08/13 10:22:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.129 2012/08/16 09:58:08 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -386,14 +386,16 @@ src_test() {
 	runtest() {
 		local cmd=$1
 		shift
-		einfo "${cmd}" "$@"
-		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "$@"
+		local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
+		einfo "${cmd}" "${filter}"
+		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
 	}
 
-	# ICUStringConversionsTest: bug #350347.
-	# MessagePumpLibeventTest: bug #398501.
-	runtest out/Release/base_unittests \
-		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
+	local excluded_base_unittests=(
+		ICUStringConversionsTest.* # bug #350347
+		MessagePumpLibeventTest.* # bug #398591
+	)
+	runtest out/Release/base_unittests ${excluded_base_unittests[*]}
 
 	runtest out/Release/cacheinvalidation_unittests
 	runtest out/Release/crypto_unittests
@@ -401,11 +403,14 @@ src_test() {
 	runtest out/Release/gpu_unittests
 	runtest out/Release/media_unittests
 
-	# NetUtilTest: bug #361885.
-	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
-	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
-	runtest out/Release/net_unittests \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned:URLFetcher*'
+	local excluded_net_unittests=(
+		NetUtilTest.IDNToUnicode* # bug 361885
+		NetUtilTest.FormatUrl* # see above
+		DnsConfigServiceTest.GetSystemConfig # bug #394883
+		CertDatabaseNSSTest.ImportServerCert_SelfSigned # bug #399269
+		URLFetcher* # bug #425764
+	)
+	runtest out/Release/net_unittests ${excluded_net_unittests[*]}
 
 	runtest out/Release/printing_unittests
 	runtest out/Release/sql_unittests