diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-04-12 22:39:03 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-04-12 22:39:03 +0000 |
| commit | 9a60ad69b73183f657221a289417ef651abf0c4d (patch) | |
| tree | 9e625ba88231fbb468d747e68ee162622279e5cb /net-misc | |
| parent | Version bump per bug #261009. (diff) | |
| download | gentoo-2-9a60ad69b73183f657221a289417ef651abf0c4d.tar.gz gentoo-2-9a60ad69b73183f657221a289417ef651abf0c4d.tar.bz2 gentoo-2-9a60ad69b73183f657221a289417ef651abf0c4d.zip | |
cleanup previous test commits
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/openssh-5.2_p1-r1.ebuild | 9 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.2_p1-r2.ebuild | 11 |
2 files changed, 9 insertions, 11 deletions
diff --git a/net-misc/openssh/openssh-5.2_p1-r1.ebuild b/net-misc/openssh/openssh-5.2_p1-r1.ebuild index 01354a7b1664..9957b21bd4f0 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.9 2009/04/12 20:10:55 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r1.ebuild,v 1.10 2009/04/12 22:39:03 vapier Exp $ inherit eutils flag-o-matic multilib autotools pam @@ -171,12 +171,11 @@ src_install() { } src_test() { - local t failed passwd + local t tests skipped failed passed shell 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 + shell=$(getent passwd ${UID} | cut -d: -f7) + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then elog "Running the full OpenSSH testsuite" elog "requires a usable shell for the 'portage'" elog "user, so we will run a subset only." diff --git a/net-misc/openssh/openssh-5.2_p1-r2.ebuild b/net-misc/openssh/openssh-5.2_p1-r2.ebuild index 84cf181a87bd..d215f08e8d60 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.6 2009/04/12 21:07:56 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.7 2009/04/12 22:39:03 vapier Exp $ inherit eutils flag-o-matic multilib autotools pam @@ -179,12 +179,11 @@ src_install() { } src_test() { - local t failed passwd + local t tests skipped failed passed shell tests="interop-tests compat-tests" skipped="" - portage_shell="$(getent passwd ${UID} |cut -d: -f7)" - if [ "${portage_shell/nologin}" != ${portage_shell}" -o - "${portage_shell/false}" != ${portage_shell}" ]; then + shell=$(getent passwd ${UID} | cut -d: -f7) + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then elog "Running the full OpenSSH testsuite" elog "requires a usable shell for the 'portage'" elog "user, so we will run a subset only." @@ -198,7 +197,7 @@ src_test() { && passed="${passed}${t} " \ || failed="${failed}${t} " done - einfo "Passed tests: ${passed}" + einfo "Passed tests: ${passed}" ewarn "Skipped tests: ${skipped}" if [[ -n ${failed} ]] ; then ewarn "Failed tests: ${failed}" |