Add the SSH testsuite, because I think the latest HPN patch has a breakage that was missed.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 47 insertions, 6 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index bcffbce86085..dbc8deb785a5 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.341 2009/03/09 03:42:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.342 2009/03/11 20:35:07 robbat2 Exp $
+
+  11 Mar 2009; Robin H. Johnson <robbat2@gentoo.org>
+  openssh-5.2_p1-r1.ebuild, openssh-5.2_p1-r2.ebuild:
+  Add the SSH testsuite, because I think the latest HPN patch has a breakage
+  that was missed.
 
 *openssh-5.2_p1-r2 (09 Mar 2009)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 000cf9ea033f..4ba4dc3e8a90 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -53,7 +53,7 @@ EBUILD openssh-5.0_p1-r1.ebuild 5184 RMD160 2eb4fa43b1c54fc2145cd0440e15bd26d6a4
 EBUILD openssh-5.0_p1-r2.ebuild 5232 RMD160 3b0247e5b71cb12720f8746dfa9f7d50c0f55f06 SHA1 eafb35830abcc0458c73ba7a73530e21a0c64290 SHA256 fa8f82eafb1d7d9d4b876855735b1e4d042d961c44cbcab1586e52ffdda9f59d
 EBUILD openssh-5.1_p1-r2.ebuild 5465 RMD160 64e7b382e6a1c664b4e6ad6d93199dc8ed1985e6 SHA1 e42626794f7af0f265073d1b89a96852b5af8cbb SHA256 0cddb635f824087f3c6d39738a990b6cccc263d8ce33983f5f01b937250bbdcf
 EBUILD openssh-5.1_p1-r3.ebuild 5735 RMD160 4ce7ec18877d6bec6f5370a00ef82790ad87dbd9 SHA1 63e87f68db66e7b5dc39f08317d05284faeb9219 SHA256 acec83baf78e4ac4cb2fa3c2a5064ae00164581b0d8c1aba43e7dc5cec0cddde
-EBUILD openssh-5.2_p1-r1.ebuild 6166 RMD160 b1c57340fc6b4290678b542f29700bc8bc80fb81 SHA1 b6a353a575bbae3485ef18fbe9359f383edbc95e SHA256 619578b6dd20b7405cde2bf274114ce312ad88e1d958a4dd4a6b06edd9ab2e65
-EBUILD openssh-5.2_p1-r2.ebuild 6752 RMD160 1a1df7be5c8dd2052e61635e944eb0b7bd9cc1b1 SHA1 1d5e9902d077228ac38e1e9b222827b467e57754 SHA256 b4b503198e1091051708e3b06f9b855ea0c8e8545f16f18bd7e264a66b44ff33
-MISC ChangeLog 53332 RMD160 d7e08e81da5c9cedf3d4277a424eb0eb1594f1eb SHA1 362c6f2f25db08696da70ad669fe39a776111c8a SHA256 5f3ff0373035ee2ae786905f6a37036ef3947010dd2a7c24dde214f20e4d997e
+EBUILD openssh-5.2_p1-r1.ebuild 6551 RMD160 64a48b29007c1a214318639a15fdff8e6b1556b0 SHA1 cb16879f1f0942f6da0c31de43d61e81ab588ea4 SHA256 77efdfef6e01ad72154c0b16b31bde273a7a7b2083f0dac140d3c906c0af34e4
+EBUILD openssh-5.2_p1-r2.ebuild 7134 RMD160 392d5589c21e357f16c72acce942f91822e1a623 SHA1 c7f863ea613382df1661d8f1ea376bb549085676 SHA256 34fa1f838f59b937366ffc1d0903e03b51a932bc330e3178d066506bb49a2447
+MISC ChangeLog 53536 RMD160 b7308282dd10f49ced055fcc91821dcb72468ec1 SHA1 bcfceee7175e3ad4dc5631ed9b7a7c42dcbf0f07 SHA256 54fe90b7e6edafce2f99a68afa36e950e6891a1045f55bff970356384635a646
 MISC metadata.xml 1694 RMD160 1cf9a91557876877658f9aaab4d4b4b4ebbcc3fe SHA1 402aab3f56cd775a5443f467a73b637d03919f5c SHA256 9c65ad59ae9fb4d7f1fdbcb04d0535984dd107484eedb2e90d4331a21de680c2
diff --git a/net-misc/openssh/openssh-5.2_p1-r1.ebuild b/net-misc/openssh/openssh-5.2_p1-r1.ebuild
index 10663014dda0..a4998c542477 100644
--- a/net-misc/openssh/openssh-5.2_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-5.2_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r1.ebuild,v 1.2 2009/02/25 18:13:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r1.ebuild,v 1.3 2009/03/11 20:35:07 robbat2 Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -170,6 +170,24 @@ src_install() {
 	dodir /etc/skel/.ssh
 }
 
+src_test() {
+	local failed="" passwd=""
+	for t in tests interop-tests compat-tests ; do
+		einfo "Starting ${t} testsuite"
+		emake -j1 ${t}
+		[[ $? -eq 0 ]] \
+			&& passed="${passed}${t} " \
+			|| failed="${failed}${t} "
+	done
+	einfo "Failed tests: ${failed}"
+	einfo "Passed tests: ${passed}"
+	if [[ -n "${failed}" ]]; then
+		die "Some tests failed: ${failed}"
+	else
+		return 0
+	fi
+}
+
 pkg_postinst() {
 	enewgroup sshd 22
 	enewuser sshd 22 -1 /var/empty sshd
diff --git a/net-misc/openssh/openssh-5.2_p1-r2.ebuild b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
index bcc84b6927fd..2953962a1bb2 100644
--- a/net-misc/openssh/openssh-5.2_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.2 2009/03/09 04:23:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.3 2009/03/11 20:35:07 robbat2 Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -178,6 +178,24 @@ src_install() {
 	dodir /etc/skel/.ssh
 }
 
+src_test() {
+	local failed="" passwd=""
+	for t in tests interop-tests compat-tests ; do
+		einfo "Starting ${t} testsuite"
+		emake -j1 ${t}
+		[[ $? -eq 0 ]] \
+			&& passed="${passed}${t} " \
+			|| failed="${failed}${t} "
+	done
+	einfo "Failed tests: ${failed}"
+	einfo "Passed tests: ${passed}"
+	if [[ -n "${failed}" ]]; then
+		die "Some tests failed: ${failed}"
+	else
+		return 0
+	fi
+}
+
 pkg_postinst() {
 	enewgroup sshd 22
 	enewuser sshd 22 -1 /var/empty sshd