Add fix from upstream when running tests w/out a tty on stdin #461302 by Roman Žilka.

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 149 insertions, 21 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 6dea75b4d880..8d58dce124bc 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.138 2015/05/18 04:19:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.139 2015/05/18 04:25:36 vapier Exp $
+
+  18 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/procps-3.3.10-tests-no-tty.patch, procps-3.3.10-r1.ebuild:
+  Add fix from upstream when running tests w/out a tty on stdin #461302 by Roman
+  Žilka.
 
   18 May 2015; Mike Frysinger <vapier@gentoo.org>
   +files/procps-3.3.10-pmap-unreadable.patch, procps-3.3.10-r1.ebuild:
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 4b168b2fa950..7222f9e27f8b 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX procps-3.3.10-pmap-unreadable.patch 1775 SHA256 d4f34e6f33038f7599f403975bafd7f349013089fa2feda913b3ac9c56830c86 SHA512 d9ee6f9eb8d66b3777f0ec12066dd14d1849eb056b971b36f19612b2bcf60604fc361913b39b82766946f4a0e39907b68054bbc640b09b2e828c794824d79a57 WHIRLPOOL f4becc813b25d96fc778ce31f96494f8de13194a4ec5f7dbf184c99fd36a418f8fe5af0feb04c01b8f636660abe562131081031e868d9a739a1521fc7205e154
+AUX procps-3.3.10-tests-no-tty.patch 3841 SHA256 ca0d656d9d52b602874683542941c680cc948985dbbfbab7d731cfb673b42e7e SHA512 299b9272c7746f77f16db09c96b34cf62b74fd63afb8c815bcab07ecfba6c31c2d3a10e54583c899a7ed91e4e22f80f8c46cccb7237e9ad9bf0c94e09167df6a WHIRLPOOL 6f3a217d162235a8db3cb7a8e927e866d27d795e0eca758c6ef43f869fc20009cc7a1623d60e9f72788b18248928cd36a2d17911d9067b84c50c2ac677138ac7
 AUX procps-3.3.8-kill-neg-pid.patch 1446 SHA256 847c21f6619c7aa0f2847726a17595f986ec2fe0f361d95e17812639abe32a79 SHA512 3ed4e83d81f7dd574ff68bbcae9ad9f8649a39d46a17de5fd4297f215d8f70cd28e415b1d3c7b5142e7719343af28f4b393061a60eb012caece81dfe5ff6c271 WHIRLPOOL cf452118312e60a0bab7a4ec87bed9a9d2f5fb8bb563769a0430f11c72348e5be79bdfc031f67f4e97e0bf9b32f6ccd1ac590f392c95ee935b77b857ce1b1739
 AUX procps-3.3.9-sysctl-load-config-files.patch 400 SHA256 f744a549f9205a47d892687d90096b25098ca91ae5f81879874e07e531d47131 SHA512 f528d5425ef55c3816403f3f0e61c0958726c561565e4702c5f3c09c695dcde4031d8d1aa4b30a621561ea020a66111291a5640ff51d53355d20168a319cf1d9 WHIRLPOOL fcf6b22c58ee21ba6aa49747903d06786a3283235821acf6277e5ed9301899ea389d54674d8ff614b6787a2b3d8c6c296f33017695b4061a6580980562029636
 DIST procps-3.3.8-respect_epipe_in_fileutils.patch 1412 SHA256 4a56c88697fa6099a62a4169838c9c04df2c2c2bbc08e9ad9953e5b00df16d68 SHA512 317fc8e7c3fbd280182f55b399a30b2cfbc72268590825ea323537361cd761776afe1486509cb04ae937287ccf11578def5aac2eaa0fe660d04f0357282d9c14 WHIRLPOOL f8fdac8a172037edf51e1e777374293848afaa2180adc35adce5bf8ebefceb37df30082b27f6d6f1f5a571ba0f84bdfff9fc6c2343f120ce5c80b2f52e1804ac
@@ -9,26 +10,26 @@ DIST procps-3.3.8-top_user_filter.patch 2355 SHA256 089d7d0a0a497d88d34f3d05da24
 DIST procps-ng-3.3.10.tar.xz 657232 SHA256 1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512 cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f WHIRLPOOL 723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b
 DIST procps-ng-3.3.8.tar.xz 553056 SHA256 a4109cfb6fe3bcfb5a0efb37efe04d0c8ce858bff3820d48cc258bad41bed46b SHA512 63ba13f9ef0f4558748c6b2d1b0719a1173bd87e38279e3b052a10e207e1b808626d031f16dd65b05c55708366df7350cb0a64da8dc20e7f9f1fdc1cd2417c71 WHIRLPOOL 671860af1f028c9c8c7bb0c035db86e3e13d9d754801e7a3f19105710bb9720bbfa627e4e748b823192286319fe4e7e736c1af5a3fb34116cbe93386b0d2bed6
 DIST procps-ng-3.3.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512 62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553 WHIRLPOOL dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166
-EBUILD procps-3.3.10-r1.ebuild 2058 SHA256 1cf6dfa79b66e28c533bb0ce6f22d0b72084d2e50ed4515fbc6fa7411669dff6 SHA512 0e8cdc72f031b1306104d6c76a4adb7074d62bfc00727720fc416e1b787dcf26b89f3d0d37cc114f28b02b3dd9c9a0d7cb33630c7a4e521aeed38de0b7f061b1 WHIRLPOOL 4a623ba1e9296825391d6996a47754959ef109e4c55fc024127e5a4e25c980465777f532babfeb27b5fdc1330e43db432a67934674fc401c15e883b11b989772
+EBUILD procps-3.3.10-r1.ebuild 2154 SHA256 1cebf2a44f4d67ad95882e21fdcfde215164e443e72d2259dc504a5e2c1b543a SHA512 1a0ed104f376187a89a09a2972bd56a63e3dfbfada0a516c9e36788821b032b09b90ab639451df8e6253bbb789e44227f638bb794929b8ddefdd3a7da901467d WHIRLPOOL 5c548dc427e6d7ada5c33310aa59a4736f02357bb5235bc52c2509e9027cd3e9eb87b3135309021456bdafeab2b73cee847f816b9dd60bdcdb2bf7ef5a19a669
 EBUILD procps-3.3.8-r2.ebuild 1885 SHA256 28ae59fc4b34f67d9f3b0c85d9abb56c5d5afd17ad0304649f1897eb7ba924b0 SHA512 99fe192331929060d5940c3a1f864e07f941d9c3a8b1a51cff7c96704bfed161375fcd0e49b35168bba0e4fc7926839decff0027e9144c2b43cfd852df8f4a7a WHIRLPOOL afb62ffc281d137a88b6c2369f9911f51f792a888484ddb588ca5cc0d979a62fa7f7c942f56664a44c035e8ef922085b858d514572b8fc5380cf59ffe50e3ea8
 EBUILD procps-3.3.9-r2.ebuild 1904 SHA256 3000c4f533a0ade9832b8d0e8d3f35d48a90efcaae93da2537d26bf5705e34a0 SHA512 4744bc00a7e4c316520c6f1a07a91848d7bb828b50f8bd4e59aadc35fbdd87daef6b08d55f618ad2db4ae40169d845c53d06938a5c591355c0d741fe6bbe761c WHIRLPOOL 8512f31b3c44791beb50202df78bbfd7186376f0965ccdde19377dfb72cdd105c019cadd7e1c3d9d141314768d33a666111110ce42fe26efc2170c8ccff152dc
 EBUILD procps-3.3.9.ebuild 1598 SHA256 60649c034fd165f9fb62ee9c4ef0a9acdab8c20d9f59617293df6b66bb857643 SHA512 c4347b5df6f473d554640dbb77344801944e975b9398e3727087c3f858bcb7317ee82ec19782c8208e7877f9a058dc595676c99b1e478de16bd8a0397259b756 WHIRLPOOL 38819a28c9a667ce20eefe4a28f44a35c0ab7533e2462cd70435f081c876448253a2e33909c4bf8bf5ac1645aa3f158110656787e16faf81348cbcb30d0a086f
-MISC ChangeLog 35469 SHA256 e909e58c53455ae9ea5adddd3add333d88684921acba7a10368dbfc1823ae456 SHA512 60bb60e028f7485c2602864ce95a46f708e2c6b516c9c69dbe753f4d41336ab935cfccd4b650b851f6c311c0d7bda4a5a4488f1629a964216e3241bd98cd7958 WHIRLPOOL fdb11dbb9ebfd9597b209c0272024c459da496e25e92109122a9826ae6c9e34a0bd581b30d66bcf613e08ad9e4a2d80acc6974be3ff16d7bc6ca2da11a2887bc
+MISC ChangeLog 35679 SHA256 70e2e76e73083cc0ea98a2f75cc0e08b1e367cb4782f6a2a82d707b15c0fc241 SHA512 fb073a1aa835cf1755419ce771db8c285d3b61bfb5f3a97539335a1a1af078492a1de1e33696e290c141b00d1070b1f146a98723bc8c02bf200acbf28d924a82 WHIRLPOOL 4d7a3c0694e509803b9def0dd6e5bd4b688d22615393dace1112a20354ba60cdbe1c90edee4b0b7adf3c718fc7986a50f9cca9582c07c2f59a3e985abd43c497
 MISC metadata.xml 377 SHA256 c0a45638c35d967d63370589161a647aff1e986589bbad5c1d0ed49566e6cdba SHA512 b554a36656163db9ad2d27719b2b2a5b5c9033ac83723c9387dcb68a895f83213bbed08f6a7cddb4777bfcb91981f958dab3ec6527c6bf9bd175c1d3c60cf973 WHIRLPOOL 58aad116a5100d29538791538d1accb86acb808267a431e95c8051f6a682ac94def16131e4ae86c4b29b71c9eb7748d7edf64284c9c86295680c45fe9fe02a84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVWWg2AAoJEPGu1DbS6WIAPTIP/08y2IlMB+ty1y7YqFpJZugh
-+WmROaO8g4gWpiG9FHkGDlWz/ZkF9rZbwnrHTq1mqrPsMezLVRJaYGuXhmcfCn2E
-OpipgI59ab3tjFC8Hj1kHA3DUq2gMaT185xfbm0Ct2oMdwa+y7ZAGnhgh8ENNZqR
-ymnd6dVYRJOXuOQUqbMEuWW7ck14zdVzqwn+WfOsFW8/bJnfg1rtzhVG7zNIlTEz
-MZhGDptI1nmppNHbSDW+/4KM5bTx5eLr5CiVDtPM92BGa7ED3KDwIs81ssWpWYY4
-3oW3ntJKTUew/sEikDE7L4oaqmpS+zaSIpxsQJwPy/XEtQjOKBGojnEGYd0DiVIK
-+r0iBqu1PyeUr/rXQoxvma+B605GeFqVxoz/Ogh7c94zQA987Qbuk12NmRj3WQko
-fbX8nxf+abNOwZxadnBvpr7PRXk7C4Oi0RzxELf3Q/j/brHll7P+l5ZLJyJIhwMW
-15k9HXF/1xGrmXlnQB6KTNxgj0yVuUA1AyM2K9l9i+61wGyVlrm7KA8PKE0GJJKU
-qYmwTgOC1uhQih6v91Tmof766VZaecEt1tFHGeScMzI2cK9EA/nWTguITOH/JdKf
-j/4+AhpwoA+EHA3HLTzcPcPeZ4qhsOQSAGjl/SPwz3xMSB08o5ZoKE9TNq6r6+ah
-qtVoK8TR/E3nA6Vejsuv
-=uYq5
+iQIcBAEBCAAGBQJVWWnBAAoJEPGu1DbS6WIAmc4P/jkSzy2/rUrJtRV/eqI7AAXi
+kKyWER4Hp4pecB5ITKHpJDj5eYxSYnTpV4s2jtzx8Q5u1wlX5kBWnooNc6i2NHF5
+VATZttfGwAlQs5RjUBZNP9EnkAcObN8X3BxbR6XwK6gfReLUy33Bouuf1Rjp0E8p
+s8anQkkvQ73rCVpP5k14a+nWJV6FMQZKX7LSKMdVkuxhUoqGGkTpGjEkRT+E4i17
+VbQ1IEL1y3MIbpWXE9/TVdYcWZYveixgu0Pz/QuW8xRhRnCNvmrxS7hPJTf7JmQU
+3X35hJV/IINhXiZCKXU3kvkw1mw3oMAZXnVOg2hat8sx185qhd/XpDZ0NSWBORRR
+q0SWv9BdqLZu8K04cVO8caJ2v0qXy+taX5SIJgI+ZB31BmlwRkvQzwUtt0uv2Khw
+WGG86eLz/mKls9c904P/RVEDvkdOFAoJw9v0rQsFwVokHhvGcX01X0Iz3+safjQB
+inmA20dZvq9m4R41l7U6TqtOTSLTIUCjjRgK3e2AXJJbQcLnjbdBXPi6DicJWJqm
+EHPJ0hEaupRZryl5ViQHe9fkXlXHxbJWQD1P9wXWmX4Nh5Biz2zH+wbQD4u0MOJN
+HWa7kg+uOF/yH6v3SCvyvOWUzhBM7yHMWxpU1Y4RLm8gEoCLGMUP06p2yCGbT3Oq
+d3Hxf5pOzB4f9YK1AERQ
+=CaIE
 -----END PGP SIGNATURE-----
diff --git a/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch b/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch
new file mode 100644
index 000000000000..7a774e5f2ef1
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch
@@ -0,0 +1,122 @@
+https://bugs.gentoo.org/461302
+
+From 4050148a4533e8a79cef0d7dcd0c058d78c48a31 Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@enc.com.au>
+Date: Sat, 9 May 2015 17:48:12 +1000
+Subject: [PATCH] Fix some sched and tty tests
+
+The ps sched test has been disabled. There are too many
+odd build farms this fails in strange ways.
+
+Other odd build farms have no tty and so some tests check
+for no tty and skip if not found.
+---
+ testsuite/config/unix.exp            |  9 +++++++++
+ testsuite/pgrep.test/pgrep.exp       | 11 +++++++----
+ testsuite/pkill.test/pkill.exp       |  3 +--
+ testsuite/ps.test/ps_output.exp      |  2 --
+ testsuite/ps.test/ps_sched_batch.exp | 16 +++++++++-------
+ 5 files changed, 26 insertions(+), 15 deletions(-)
+
+diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
+index 522efb1..1318e9a 100644
+--- a/testsuite/config/unix.exp
++++ b/testsuite/config/unix.exp
+@@ -146,3 +146,12 @@ proc kill_testproc { } {
+     kill_process $testproc2_pid
+     file delete $testproc_path
+ }
++
++proc get_tty {} {
++    if { [catch { set raw_tty [ exec tty ] } msg]} {
++        warning "No TTY found"
++        return ""
++    }
++    regexp "/dev/(.+)" $raw_tty > tty
++    return $tty
++}
+diff --git a/testsuite/pgrep.test/pgrep.exp b/testsuite/pgrep.test/pgrep.exp
+index 152b6ec..1c6cec6 100644
+--- a/testsuite/pgrep.test/pgrep.exp
++++ b/testsuite/pgrep.test/pgrep.exp
+@@ -9,8 +9,7 @@ set not_uid [ expr { $uid + 1 } ]
+ set gid [ exec id -g ]
+ set not_gid [ expr { $gid + 1 } ] 
+ set ps "${topdir}ps/pscommand"
+-set raw_tty [ exec tty ]
+-regexp "/dev/(.+)" $raw_tty > tty
++set tty [ get_tty ]
+ 
+ set test "pgprep with no arguments"
+ spawn $pgrep
+@@ -80,8 +79,12 @@ spawn $pgrep -s 1 $testproc_comm
+ expect_blank "$test"
+ 
+ set test "pgrep matches on tty"
+-spawn $pgrep -t $tty $testproc_comm
+-expect_pass "$test" "^$testproc1_pid\\s+$testproc2_pid\\s*$"
++if { $tty == "" } {
++  untested "$test"
++} else {
++    spawn $pgrep -t $tty $testproc_comm
++    expect_pass "$test" "^$testproc1_pid\\s+$testproc2_pid\\s*$"
++}
+ 
+ set test "pgrep doesn't match with bogus tty"
+ spawn $pgrep -t glass $testproc_comm
+diff --git a/testsuite/pkill.test/pkill.exp b/testsuite/pkill.test/pkill.exp
+index 5eece7d..c583cbe 100644
+--- a/testsuite/pkill.test/pkill.exp
++++ b/testsuite/pkill.test/pkill.exp
+@@ -9,8 +9,7 @@ set not_uid [ expr { $uid + 1 } ]
+ set gid [ exec id -g ]
+ set not_gid [ expr { $gid + 1 } ] 
+ set ps "${topdir}ps/pscommand"
+-set raw_tty [ exec tty ]
+-regexp "/dev/(.+)" $raw_tty > tty
++set tty [ get_tty ]
+ 
+ set test "pkill with no arguments"
+ spawn $pkill
+diff --git a/testsuite/ps.test/ps_output.exp b/testsuite/ps.test/ps_output.exp
+index 3a6f3d8..1b2c097 100644
+--- a/testsuite/ps.test/ps_output.exp
++++ b/testsuite/ps.test/ps_output.exp
+@@ -9,8 +9,6 @@ set uid [ exec id -u ]
+ set not_uid [ expr { $uid + 1 } ] 
+ set gid [ exec id -g ]
+ set not_gid [ expr { $gid + 1 } ] 
+-set raw_tty [ exec tty ]
+-regexp "/dev/(.+)" $raw_tty > tty
+ 
+ # All the fields
+ # Cannot do args,cmd,comm
+diff --git a/testsuite/ps.test/ps_sched_batch.exp b/testsuite/ps.test/ps_sched_batch.exp
+index e0c31ff..c58b9a2 100644
+--- a/testsuite/ps.test/ps_sched_batch.exp
++++ b/testsuite/ps.test/ps_sched_batch.exp
+@@ -1,12 +1,14 @@
+ #
+ # check the ps SCHED_BATCH scheduler policy output
+ #
+-set ps "${topdir}ps/pscommand"
+-set schedbatch "${topdir}testsuite/test-schedbatch"
+-
+-spawn $schedbatch 18
+-
++# This is too flaky on certain build systems to be
++# reliable - CS
++#set ps "${topdir}ps/pscommand"
++#set schedbatch "${topdir}testsuite/test-schedbatch"
++#
++#spawn $schedbatch 18
++#
+ set test "ps SCHED_BATCH scheduler"
+-spawn $ps --no-header -o comm,cls,nice -a
+-expect_pass "$test" "\\s+test-schedbatch\\s+B\\s+18"
++#spawn $ps --no-header -o comm,cls,nice -a
++#expect_pass "$test" "\\s+test-schedbatch\\s+B\\s+18"
+ untested "$test"
+-- 
+2.4.0
+
diff --git a/sys-process/procps/procps-3.3.10-r1.ebuild b/sys-process/procps/procps-3.3.10-r1.ebuild
index 8201bebf296c..19e4f64fd864 100644
--- a/sys-process/procps/procps-3.3.10-r1.ebuild
+++ b/sys-process/procps/procps-3.3.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.10-r1.ebuild,v 1.2 2015/05/18 04:19:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.10-r1.ebuild,v 1.3 2015/05/18 04:25:36 vapier Exp $
 
 EAPI="4"
 
@@ -31,9 +31,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-ng-${PV}
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch \
-		"${FILESDIR}"/${P}-pmap-unreadable.patch
+	epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
+	epatch "${FILESDIR}"/${P}-pmap-unreadable.patch #404389
+	epatch "${FILESDIR}"/${P}-tests-no-tty.patch #461302
 	sed -i -e 's:systemd-login:systemd:' configure || die #501306
 }
 
@@ -51,7 +51,7 @@ src_configure() {
 }
 
 src_test() {
-	emake check </dev/null
+	emake check </dev/null #461302
 }
 
 src_install() {