[OE-core] [PATCH v2] openssh: build regression test binaries

[Khem Raj]

> On Aug 20, 2015, at 5:05 AM, Jussi Kukkonen <jussi.kukkonen at intel.com> wrote:
> 
> ptests were failing and many more were being silently skipped because
> required binaries were not being built.
> 
> Build the binaries in regress/ and set SUDO environment variable in
> run-ptests: after this all tests in regress/ are now run. Continue to
> skip building binaries in regress/unittests/: unittest runtime is
> excessive.
> 
> On a NUC running intel-corei7-64 core-image-sato, new results are:
> PASS: 55, SKIP: 3, FAIL: 0

btw. openssh 7.1 is already out.

> 
> [YOCTO #8153]
> 
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
> ---
> 
> Changes in v2:
> * ptest package RDEPENDS on sudo
> 
> 
> meta/recipes-connectivity/openssh/openssh/run-ptest | 2 +-
> meta/recipes-connectivity/openssh/openssh_7.0p1.bb  | 8 +++++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest
> index 3e725cf..564c0c8 100755
> --- a/meta/recipes-connectivity/openssh/openssh/run-ptest
> +++ b/meta/recipes-connectivity/openssh/openssh/run-ptest
> @@ -3,5 +3,5 @@
> export TEST_SHELL=sh
> 
> cd regress
> -make -k .OBJDIR=`pwd` .CURDIR=`pwd` tests \
> +make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \
>         | sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g'
> diff --git a/meta/recipes-connectivity/openssh/openssh_7.0p1.bb b/meta/recipes-connectivity/openssh/openssh_7.0p1.bb
> index 105875a..8519a4c 100644
> --- a/meta/recipes-connectivity/openssh/openssh_7.0p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_7.0p1.bb
> @@ -79,6 +79,12 @@ do_configure_prepend () {
> 	fi
> }
> 
> +do_compile_ptest() {
> +        # skip regress/unittests/ binaries: this will silently skip
> +        # unittests in run-ptests which is good because they are so slow.
> +        oe_runmake regress/modpipe regress/setuid-allowed regress/netcat
> +}
> +
> do_install_append () {
> 	if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
> 		install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
> @@ -130,7 +136,7 @@ FILES_${PN}-keygen = "${bindir}/ssh-keygen"
> 
> RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
> RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
> -RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make"
> +RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sudo"
> 
> RPROVIDES_${PN}-ssh = "ssh"
> RPROVIDES_${PN}-sshd = "sshd"
> --
> 2.1.4
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20150824/3f7bac80/attachment-0002.sig>