Disable sleep()-based tests by default, see bug #512826.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x743A52E86BA81050

3 files changed, 33 insertions, 17 deletions

diff --git a/dev-libs/check/ChangeLog b/dev-libs/check/ChangeLog
index 9e044df0efb7..99ca0f825a31 100644
--- a/dev-libs/check/ChangeLog
+++ b/dev-libs/check/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/check
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/ChangeLog,v 1.96 2014/06/12 04:57:55 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/ChangeLog,v 1.97 2014/06/12 06:05:39 binki Exp $
+
+  12 Jun 2014; Nathan Phillip Brink <binki@gentoo.org> check-0.9.13.ebuild:
+  Disable sleep()-based tests by default, see bug #512826.
 
   12 Jun 2014; Nathan Phillip Brink <binki@gentoo.org> -check-0.9.10.ebuild,
   -check-0.9.9.ebuild:
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 426a2694a4db..3c22c84ff4be 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -10,24 +10,24 @@ DIST check-0.9.13.tar.gz 752880 SHA256 ca6589c34f9c60ffd4c3e198ce581e944a9f040ca
 DIST check-0.9.8.tar.gz 558943 SHA256 82acf956bb07584ffea2bf04d5989fe939c3e74ecf93133a21037fd0f7996a7f SHA512 a8ef659411c18f8af77006a51fe14741b990e7486c3e5c1e97cd2a100a603483ba9854c2f23bd9a5e834e133ca0dcc3ae15f41856339ab3b82a75ad769a872a2 WHIRLPOOL fdc06bd44f041153f655c577c55825afb2d2b79ff066427cd224b5a6d351f9da076d39807f434d2e22e1b6b54c6bc774744c8210dc318e493b9241bb5d7ded84
 EBUILD check-0.9.11.ebuild 1505 SHA256 dcd940bfbf9f567a40361cfdb4db9df14948e3d9445a86cf04a3d5d774d2b37f SHA512 ce5c6f5b409baa1e8f6f7bc8ad7822dc5e2c6188a17fe5ebd13972cb6ef3281f899b9df031714d5ad0db246bd6c6b53613b3198e92b764a9024d929140f80f39 WHIRLPOOL 416fdb377d06081b593af0c4d12b46173a6a648a603f7372671363761cbaf153f255a84acd5a9449d499bb397ae442fb387142bfe0e591f1a3baa33bce6ced16
 EBUILD check-0.9.12.ebuild 1513 SHA256 95c31e31a34ae4cccf8aa8e005a7413548741d9c7f1224e3d996002e71b51cbb SHA512 4d03f814972c0f1ba47c05e475646c998133fe4c9a4a1df51ba4d4a050e3fb3b83f9d98ae7dfe1a1b528dff60ee338cff60771423284acf37af5c45c96a958f4 WHIRLPOOL 5491facefb4ccb7c38566c975d8ceb0f0cd23bccc77319c60b7e7aeed3e1ecb88960795c99d0551a8ae952399af9bab8d329b6b5dffee63a01501d9876f22aef
-EBUILD check-0.9.13.ebuild 1455 SHA256 8525d550158ca325ec60282a6fd327b7a783895376cbf276d2033d5327b0d637 SHA512 d4e05fd8720ed6adee8a73672165cbeff47c5d847f53722cbf5c84243768bd0a21ed8694b438018fc4e54a0d164add627a84738d62d2826ac8e222935b1c48a4 WHIRLPOOL 6f379cf368abda7ae295b7f00868f70cf0b43e68cb4c5a0baf319701fc8168f16ea88d88ff061b658fb5848b2ddafa325905568d1508b750266c1041f823296b
+EBUILD check-0.9.13.ebuild 1882 SHA256 cfa52a7b1dd0abaa994147816725f79d848634ff43f637d05369b4a051290db7 SHA512 f0e482cde1a7de1daef3f94519e253154e86493d65f81907a9ffd1174374367861de2c1c22884e080c479e70a58d507d96dee1b1366370b49cce897b1348686f WHIRLPOOL 302cd459705bee5a4351a5beaf4bd1976a9af2ca7e48eb157683e9aa529be10619af1f53f38ac8ae2c429fd239e578922f7762c1b379e9ae4a4a1f8c7cd79cbb
 EBUILD check-0.9.8-r1.ebuild 1555 SHA256 883dd2984c0873e4de8bbf878e7de1a80eb111116bba8b38e294e73390579a81 SHA512 e3574a1eec0f82982de5d44046806a0c4e3d116fc87b952108a70863889944a0e59ad522d3c9e5a85e1aaa19f9f70c7e9688aab43f124881e1acdb91c51590b9 WHIRLPOOL b5fa0c07d27278a3855d007310073da083eef5bd1c35c183808c73336789ab0d3b6d2364d1904f79eda12eec885886382d9744738d88dba17b83abf69b0ce9dc
-MISC ChangeLog 11276 SHA256 17ce4885f81e8adb0e025e9563f52bad355a624935ab92fe9428a1885d0a058d SHA512 c15a9413c434fa6ec4cc0cee392dbf96051d4503e1e76b7284e06a7ec683e3fc14de91a31cefb7781b442ed82d1d7d0bd17d8a8397a991832251d8f21eca4066 WHIRLPOOL acae474479596f2765183137d0f44741bf5de4d91527997c6dc7154762521ca9ab253ea10b4a720a091c79221448991acf07878fb8e22a6b1bd6bbc0ad107e8b
+MISC ChangeLog 11412 SHA256 775cd42a0e7b9306e6423901219b195c27b00e5dc4fcb4e22f9453e5fadb0d21 SHA512 ca79b43325db9830102a3be781cfafc79e5a2f871864f2af87833642e0859ae2df4a57176490bf27813d24586d4883fd35db4cdf568245fcddffff1a4b99396d WHIRLPOOL 847051bdfb5f408723ae78a8f2669769ffccf28506871a460266d9cedc47fcf6f4ab84b1c68c48f0f2af2ed3e0f1ea46db48061bd57fef4db2fcf78722b145c2
 MISC metadata.xml 333 SHA256 f39f7a262d5d98abad6eb373533a0d86a0a9baf63f4d770e1ce7bdd3f9f09215 SHA512 cf3d3676c2bc60be323821ef5f236a93838d9e48d6a7faf7db4e5816162c0b9810efb47d342804982083b06e0e0b4f8f086662e7e42c746c48cab7bbef1ff375 WHIRLPOOL 84fff185a58c0c96a2bcee3709fcbb6a6018d9b5cd4aa125498143747ea5072d4f0e804ce1e0309cfcac8d1b7a434e379f7bf7269614fd2b16a341038a113ab8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTmTNUAAoJEHQ6UuhrqBBQk8kP/16j2keNk22uHg90GgQIfoDc
-EeKqeS0IncFVOqnk+FF/qsD6U9RfWOSVO8yZk2yUs3+mto9IOH/mHumvLw7Ih2aP
-b+ZT9HqhRdTXR3IanKdL3R+WbByfnl+GWgEEGISeLYFKmokZqihAvWOgVqJjUwxl
-lhJll0XLFTGxgnkaQ6DJK6cpwAVRJcdVyqbAfX8oDS6jzcRvMbeDz5+mgZuEwDoz
-m4iVD56ZHccafUHL5N3ymRKEN8UAsiCR74Xr/7gY4u2WcBvIMqvRaLlF51iTOG5X
-c9puF+qjihLgWDC5UyNxgamLMJddXb/+rW9Tj1McQjah6vHcvqzk8tO/7tQoyj9l
-gpYft5CRU3dXgFBC6FruvBvbfQpQ9Pb/Ju3bkA68+jZQiEnFpdYd1Qi7kPCXkKp3
-MceZwBjMRIjEMicfKvm21K859bxjICYI87KTnI/9nbtNnym/wR7MlgwIyguVTYrT
-qz9tEHCSpqHyhIu1K4CJ+XlTkdoPTRTFxGQnO1bYEr77NXh2Mt2d0+Tu8FDWzZmt
-cAyyo6ah9xUvNFO3IS3mHyeGY4twa/nyRr4ppvhCfJ9//tcJ1u1YFwU13fF3S37L
-Cp++HEW6d48oxvYxG8AZSGbq0hPfJpo3hW2wxy0gfWSU7UhJ3WRrtbEw/mtNx5l1
-rUtsDKuTVoI+VcT5GkL3
-=+X8D
+iQIcBAEBCAAGBQJTmUM0AAoJEHQ6UuhrqBBQdUoP/1nhyrtqb6jgHqkjnvhvVjS0
+of3RnONEzsYvZO5RM335EPF0vtuxNA/MuEk8tNxEeOG7YGPS2vT7rIBdoL3+xB3R
+8vvBw+HUe0/Ga0w9wMgouXDYA9fuy9epMJnSBZzg0pep3qI+y2VKhYrH4usseozE
+PK5Wiy+aphuHogRgEjH7Qtzj269gudUk7OHtIM6EmtuqubIrhaUZlSE5sA6VwJ2h
+BTpIp5Q0KsN+xkJfyNV62CLkQtO7JU1s+9PlbB43PKuycWrTqS2U2rzTJsPN0dCl
+L4m6ox8hRsm+3p2vbcMQjjPKTm/jRmNzgr6RfmEjzjcDGflAjtooh/ZWYMy7MSfK
+fU7UlGct2PkYg8tO3kpwiIsXQTl+Xcr4NEnUP6Pv2CLthhDCRGl2nqY/6zU+TBqV
+86Ome/JvtHDxNfGsVyNQsaXXa7W6vpsa0DaIMr2T4TdVmaJRy1U89bWSd8mbWw6U
+mDo3UDAPIjS7vMTWBgkBzMXwtiv+c/YGxUs2sxpHeVJ5KysvZ1lgutHQptjpHlqZ
+c1CVrB9UTJJzsiAAMX3CaCXH4mk+E9R1nyHb7KEKN40bs0JFIa2kViq8btiMWa5B
+meLRUUwYltxuBq43JSpog9j5wyfV18UHhJ9ta9J8j6bAcO/Kam6X3FXorc4rCDTY
+zOq/yrGtrbymgz3SLH4G
+=MXLy
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/check/check-0.9.13.ebuild b/dev-libs/check/check-0.9.13.ebuild
index d67777538dbb..c10c1c3be52c 100644
--- a/dev-libs/check/check-0.9.13.ebuild
+++ b/dev-libs/check/check-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.13.ebuild,v 1.1 2014/06/12 04:50:37 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.13.ebuild,v 1.2 2014/06/12 06:05:39 binki Exp $
 
 EAPI=5
 
@@ -20,6 +20,12 @@ IUSE="static-libs subunit"
 DEPEND="subunit? ( dev-python/subunit )"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	# See multilib_src_test(), disable sleep()-based tests because they
+	# just take a long time doing pretty much nothing.
+	export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}"
+}
+
 src_prepare() {
 	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die
 
@@ -42,6 +48,13 @@ src_configure() {
 	autotools-multilib_src_configure
 }
 
+multilib_src_test() {
+	elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the"
+	elog "entire testsuite for dev-libs/check, ensure that"
+	elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS."
+	default_src_test
+}
+
 src_install() {
 	autotools-multilib_src_install
 	dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO