Bug #264841, the ssh testsuite needs a real shell to run, so run a subset of tests otherwise.

(Portage version: 2.2_rc27/cvs/Linux x86_64)

3 files changed, 40 insertions, 7 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 25ab11afa931..f30002f887bf 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.346 2009/04/04 15:45:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.347 2009/04/12 20:10:55 robbat2 Exp $
+
+  12 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
+  openssh-5.2_p1-r1.ebuild, openssh-5.2_p1-r2.ebuild:
+  Bug #264841, the ssh testsuite needs a real shell to run, so run a subset
+  of tests otherwise.
 
   04 Apr 2009; Raúl Porcel <armin76@gentoo.org> openssh-5.2_p1-r1.ebuild:
   alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #247466
diff --git a/net-misc/openssh/openssh-5.2_p1-r1.ebuild b/net-misc/openssh/openssh-5.2_p1-r1.ebuild
index ba93b8e7fb17..01354a7b1664 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.8 2009/04/04 15:45:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r1.ebuild,v 1.9 2009/04/12 20:10:55 robbat2 Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -172,17 +172,31 @@ src_install() {
 
 src_test() {
 	local t failed passwd
-	for t in tests interop-tests compat-tests ; do
+	tests="interop-tests compat-tests"
+	skipped=""
+	portage_shell="$(getent passwd portage |cut -d: -f7)"
+	if [ "${portage_shell/nologin}" != ${portage_shell}" -o
+		"${portage_shell/false}" != ${portage_shell}" ]; then
+		elog "Running the full OpenSSH testsuite"
+		elog "requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped="${skipped} tests"
+	else
+		tests="${tests} tests"
+	fi
+	for t in ${tests} ; do
 		# Some tests read from stdin ...
 		emake -k -j1 ${t} </dev/null \
 			&& passed="${passed}${t} " \
 			|| failed="${failed}${t} "
 	done
+	einfo "Passed tests: ${passed}"
+	ewarn "Skipped tests: ${skipped}"
 	if [[ -n ${failed} ]] ; then
-		einfo "Passed tests: ${passed}"
 		ewarn "Failed tests: ${failed}"
 		die "Some tests failed: ${failed}"
 	else
+		einfo "Failed tests: ${failed}"
 		return 0
 	fi
 }
diff --git a/net-misc/openssh/openssh-5.2_p1-r2.ebuild b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
index 2fdb998d1d97..eb88c567e55f 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.4 2009/03/21 13:06:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.5 2009/04/12 20:10:55 robbat2 Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -180,17 +180,31 @@ src_install() {
 
 src_test() {
 	local t failed passwd
-	for t in tests interop-tests compat-tests ; do
+	tests="interop-tests compat-tests"
+	skipped=""
+	portage_shell="$(getent passwd portage |cut -d: -f7)"
+	if [ "${portage_shell/nologin}" != ${portage_shell}" -o
+		"${portage_shell/false}" != ${portage_shell}" ]; then
+		elog "Running the full OpenSSH testsuite"
+		elog "requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped="${skipped} tests"
+	else
+		tests="${tests} tests"
+	fi
+	for t in ${tests} ; do
 		# Some tests read from stdin ...
 		emake -k -j1 ${t} </dev/null \
 			&& passed="${passed}${t} " \
 			|| failed="${failed}${t} "
 	done
-	if [[ -n ${failed} ]] ; then
 		einfo "Passed tests: ${passed}"
+	ewarn "Skipped tests: ${skipped}"
+	if [[ -n ${failed} ]] ; then
 		ewarn "Failed tests: ${failed}"
 		die "Some tests failed: ${failed}"
 	else
+		einfo "Failed tests: ${failed}"
 		return 0
 	fi
 }