Patchwork openssh: package testing

login
register
mail settings
Submitter Amy Fong
Date July 27, 2012, 3:24 p.m.
Message ID <20120727152454.GA5706@windriver.com>
Download mbox | patch
Permalink /patch/33231/
State New
Headers show

Comments

Amy Fong - July 27, 2012, 3:24 p.m.
openssh: package testing
    
Package openssh's regression tests
    
Signed-off-by: Amy Fong <amy.fong@windriver.com>
---
 openssh-5.9p1/runtests.sh |   29 +++++++++++++++++++++++++++++
 openssh_5.9p1.bb          |    9 +++++++++
 2 files changed, 38 insertions(+)
Saul Wold - July 27, 2012, 4:35 p.m.
On 07/27/2012 08:24 AM, Amy Fong wrote:
> openssh: package testing
>
> Package openssh's regression tests
>
> Signed-off-by: Amy Fong <amy.fong@windriver.com>
> ---
>   openssh-5.9p1/runtests.sh |   29 +++++++++++++++++++++++++++++
>   openssh_5.9p1.bb          |    9 +++++++++
>   2 files changed, 38 insertions(+)
>
> diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
> new file mode 100755
> index 0000000..bb99a05
> --- /dev/null
> +++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
> @@ -0,0 +1,29 @@
> +#!/bin/sh
> +
> +cd regress
> +
> +make \
> +	.OBJDIR=`pwd` \
> +	.CURDIR=`pwd` \
> +	BUILDDIR=`pwd` \
> +	OBJ=`pwd` \
> +	PATH=$PATH:. \
> +	TEST_SHELL=sh \
> +	TEST_SSH_SSH=`which ssh` \
> +	TEST_SSH_SSHD=`which sshd` \
> +	TEST_SSH_SSHAGENT=`which ssh-agent` \
> +	TEST_SSH_SSHADD=`which ssh-add` \
> +	TEST_SSH_SSHKEYGEN=`which ssh-keygen` \
> +	TEST_SSH_SSHPKCS11HELPER="/usr/libexec/ssh-pkcs11-helper" \
> +	TEST_SSH_SSHKEYSCAN=`which ssh-keyscan` \
> +	TEST_SSH_SFTP=`which sftp` \
> +	TEST_SSH_SFTPSERVER="/usr/libexec/sftp-server" \
> +	TEST_SSH_PLINK="plink" \
> +	TEST_SSH_PUTTYGEN="puttygen" \
> +	TEST_SSH_CONCH="conch" \
> +	TEST_SSH_IPV6="yes" \
> +	TEST_SSH_ECC="yes" \
> +	TEST_SSH_SHA256="yes" \
> +	EXEEXT="" \
> +	tests
> +
> diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
> index 749f89e..f0880c0 100644
> --- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
> @@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
>              file://sshd_config \
>              file://ssh_config \
>              file://init \
> +           file://runtests.sh \
>              ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
>
>   PAM_SRC_URI = "file://sshd"
> @@ -81,6 +82,9 @@ do_install_append () {
>   	mv ${D}${bindir}/ssh ${D}${bindir}/ssh.${PN}
>   	rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
>   	rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
> +	if [ ! -d ${D}/opt/${PN}-tests/ ]; then mkdir -p ${D}/opt/${PN}-tests/; fi
> +	install -m 755 ${WORKDIR}/runtests.sh ${D}/opt/${PN}-tests/
> +	cp -ra ${S}/regress ${D}/opt/${PN}-tests/
>   }
>
I think these needs to be conditional on PACKAGECONFIG having "tests" to 
include tests and test scripts.  Also, I am not sure we should be 
putting them in opt, probably better to have them in ${datadir}/${PN}/tests


>   ALLOW_EMPTY_${PN} = "1"
> @@ -95,6 +99,11 @@ FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
>   FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
>   FILES_${PN}-keygen = "${bindir}/ssh-keygen"
>
> +PACKAGES += "${PN}-testing"
This should also be triggered by a PACKAGECONFIG check.

> +DEPENDS_${PN}-testing += "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
> +FILES_${PN}-testing += "/opt/${PN}-tests/*"
> +FILES_${PN}-dbg += "/opt/${PN}-tests/.debug/*"
> +
>   RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
>   DEPENDS_${PN}-sshd += "update-rc.d"
>   RDEPENDS_${PN}-sshd += "update-rc.d ${PN}-keygen"
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
Mark Hatle - July 27, 2012, 6:15 p.m.
On 7/27/12 11:35 AM, Saul Wold wrote:
> On 07/27/2012 08:24 AM, Amy Fong wrote:
>> openssh: package testing
>>
>> Package openssh's regression tests
>>
>> Signed-off-by: Amy Fong <amy.fong@windriver.com>
>> ---
>>    openssh-5.9p1/runtests.sh |   29 +++++++++++++++++++++++++++++
>>    openssh_5.9p1.bb          |    9 +++++++++
>>    2 files changed, 38 insertions(+)
>>
>> diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
>> new file mode 100755
>> index 0000000..bb99a05
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
>> @@ -0,0 +1,29 @@
>> +#!/bin/sh
>> +
>> +cd regress
>> +
>> +make \
>> +	.OBJDIR=`pwd` \
>> +	.CURDIR=`pwd` \
>> +	BUILDDIR=`pwd` \
>> +	OBJ=`pwd` \
>> +	PATH=$PATH:. \
>> +	TEST_SHELL=sh \
>> +	TEST_SSH_SSH=`which ssh` \
>> +	TEST_SSH_SSHD=`which sshd` \
>> +	TEST_SSH_SSHAGENT=`which ssh-agent` \
>> +	TEST_SSH_SSHADD=`which ssh-add` \
>> +	TEST_SSH_SSHKEYGEN=`which ssh-keygen` \
>> +	TEST_SSH_SSHPKCS11HELPER="/usr/libexec/ssh-pkcs11-helper" \
>> +	TEST_SSH_SSHKEYSCAN=`which ssh-keyscan` \
>> +	TEST_SSH_SFTP=`which sftp` \
>> +	TEST_SSH_SFTPSERVER="/usr/libexec/sftp-server" \
>> +	TEST_SSH_PLINK="plink" \
>> +	TEST_SSH_PUTTYGEN="puttygen" \
>> +	TEST_SSH_CONCH="conch" \
>> +	TEST_SSH_IPV6="yes" \
>> +	TEST_SSH_ECC="yes" \
>> +	TEST_SSH_SHA256="yes" \
>> +	EXEEXT="" \
>> +	tests
>> +
>> diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
>> index 749f89e..f0880c0 100644
>> --- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
>> +++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
>> @@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
>>               file://sshd_config \
>>               file://ssh_config \
>>               file://init \
>> +           file://runtests.sh \
>>               ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
>>
>>    PAM_SRC_URI = "file://sshd"
>> @@ -81,6 +82,9 @@ do_install_append () {
>>    	mv ${D}${bindir}/ssh ${D}${bindir}/ssh.${PN}
>>    	rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
>>    	rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
>> +	if [ ! -d ${D}/opt/${PN}-tests/ ]; then mkdir -p ${D}/opt/${PN}-tests/; fi
>> +	install -m 755 ${WORKDIR}/runtests.sh ${D}/opt/${PN}-tests/
>> +	cp -ra ${S}/regress ${D}/opt/${PN}-tests/
>>    }
>>
> I think these needs to be conditional on PACKAGECONFIG having "tests" to
> include tests and test scripts.  Also, I am not sure we should be
> putting them in opt, probably better to have them in ${datadir}/${PN}/tests

With a separate test package, it doesn't seem to me there is a reason to have 
the PACKAGECONFIG, either install the tests or don't.. (default being don't of 
course.)

As for the install location, I've seen it done both ways.  I'm not sure we have 
a standard in OE on where tests should be located.

--Mark

>
>>    ALLOW_EMPTY_${PN} = "1"
>> @@ -95,6 +99,11 @@ FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
>>    FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
>>    FILES_${PN}-keygen = "${bindir}/ssh-keygen"
>>
>> +PACKAGES += "${PN}-testing"
> This should also be triggered by a PACKAGECONFIG check.
>
>> +DEPENDS_${PN}-testing += "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
>> +FILES_${PN}-testing += "/opt/${PN}-tests/*"
>> +FILES_${PN}-dbg += "/opt/${PN}-tests/.debug/*"
>> +
>>    RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
>>    DEPENDS_${PN}-sshd += "update-rc.d"
>>    RDEPENDS_${PN}-sshd += "update-rc.d ${PN}-keygen"
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Saul Wold - July 27, 2012, 8:05 p.m.
On 07/27/2012 11:15 AM, Mark Hatle wrote:
> On 7/27/12 11:35 AM, Saul Wold wrote:
>> On 07/27/2012 08:24 AM, Amy Fong wrote:
>>> openssh: package testing
>>>
>>> Package openssh's regression tests
>>>
>>> Signed-off-by: Amy Fong <amy.fong@windriver.com>
>>> ---
>>>    openssh-5.9p1/runtests.sh |   29 +++++++++++++++++++++++++++++
>>>    openssh_5.9p1.bb          |    9 +++++++++
>>>    2 files changed, 38 insertions(+)
>>>
>>> diff --git
>>> a/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
>>> b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
>>> new file mode 100755
>>> index 0000000..bb99a05
>>> --- /dev/null
>>> +++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
>>> @@ -0,0 +1,29 @@
>>> +#!/bin/sh
>>> +
>>> +cd regress
>>> +
>>> +make \
>>> +    .OBJDIR=`pwd` \
>>> +    .CURDIR=`pwd` \
>>> +    BUILDDIR=`pwd` \
>>> +    OBJ=`pwd` \
>>> +    PATH=$PATH:. \
>>> +    TEST_SHELL=sh \
>>> +    TEST_SSH_SSH=`which ssh` \
>>> +    TEST_SSH_SSHD=`which sshd` \
>>> +    TEST_SSH_SSHAGENT=`which ssh-agent` \
>>> +    TEST_SSH_SSHADD=`which ssh-add` \
>>> +    TEST_SSH_SSHKEYGEN=`which ssh-keygen` \
>>> +    TEST_SSH_SSHPKCS11HELPER="/usr/libexec/ssh-pkcs11-helper" \
>>> +    TEST_SSH_SSHKEYSCAN=`which ssh-keyscan` \
>>> +    TEST_SSH_SFTP=`which sftp` \
>>> +    TEST_SSH_SFTPSERVER="/usr/libexec/sftp-server" \
>>> +    TEST_SSH_PLINK="plink" \
>>> +    TEST_SSH_PUTTYGEN="puttygen" \
>>> +    TEST_SSH_CONCH="conch" \
>>> +    TEST_SSH_IPV6="yes" \
>>> +    TEST_SSH_ECC="yes" \
>>> +    TEST_SSH_SHA256="yes" \
>>> +    EXEEXT="" \
>>> +    tests
>>> +
>>> diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
>>> b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
>>> index 749f89e..f0880c0 100644
>>> --- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
>>> +++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
>>> @@ -23,6 +23,7 @@ SRC_URI =
>>> "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
>>>               file://sshd_config \
>>>               file://ssh_config \
>>>               file://init \
>>> +           file://runtests.sh \
>>>               ${@base_contains('DISTRO_FEATURES', 'pam',
>>> '${PAM_SRC_URI}', '', d)}"
>>>
>>>    PAM_SRC_URI = "file://sshd"
>>> @@ -81,6 +82,9 @@ do_install_append () {
>>>        mv ${D}${bindir}/ssh ${D}${bindir}/ssh.${PN}
>>>        rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
>>>        rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
>>> +    if [ ! -d ${D}/opt/${PN}-tests/ ]; then mkdir -p
>>> ${D}/opt/${PN}-tests/; fi
>>> +    install -m 755 ${WORKDIR}/runtests.sh ${D}/opt/${PN}-tests/
>>> +    cp -ra ${S}/regress ${D}/opt/${PN}-tests/
>>>    }
>>>
>> I think these needs to be conditional on PACKAGECONFIG having "tests" to
>> include tests and test scripts.  Also, I am not sure we should be
>> putting them in opt, probably better to have them in
>> ${datadir}/${PN}/tests
>
> With a separate test package, it doesn't seem to me there is a reason to
> have the PACKAGECONFIG, either install the tests or don't.. (default
> being don't of course.)
>
I was thinking about build time and setting a standard on how we should 
do it. Clearly in this case build time is not directly a factor, but 
think of a case that has numerous tests that need to get compiled and 
linked and then have a bunch of packages with those tests enabled, build 
time will increase.

> As for the install location, I've seen it done both ways.  I'm not sure
> we have a standard in OE on where tests should be located.
>
Again, starting the discussion to get a stake in the ground, I think 
that having them in ${datadir} (/usr/share) works well and leaves /opt 
free of anything OE installs there (ie OE-core should not install 
anything in /opt), leave it for layers to use.


Sau!



> --Mark
>
>>
>>>    ALLOW_EMPTY_${PN} = "1"
>>> @@ -95,6 +99,11 @@ FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
>>>    FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
>>>    FILES_${PN}-keygen = "${bindir}/ssh-keygen"
>>>
>>> +PACKAGES += "${PN}-testing"
>> This should also be triggered by a PACKAGECONFIG check.
>>
>>> +DEPENDS_${PN}-testing += "${PN}-keygen ${PN}-scp ${PN}-ssh
>>> ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
>>> +FILES_${PN}-testing += "/opt/${PN}-tests/*"
>>> +FILES_${PN}-dbg += "/opt/${PN}-tests/.debug/*"
>>> +
>>>    RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
>>>    DEPENDS_${PN}-sshd += "update-rc.d"
>>>    RDEPENDS_${PN}-sshd += "update-rc.d ${PN}-keygen"
>>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>>
>>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
Koen Kooi - July 27, 2012, 8:58 p.m.
Op 27 jul. 2012, om 17:24 heeft Amy Fong <amy.fong@windriver.com> het volgende geschreven:

> openssh: package testing
> 
> Package openssh's regression tests
> 
> Signed-off-by: Amy Fong <amy.fong@windriver.com>
> ---
> openssh-5.9p1/runtests.sh |   29 +++++++++++++++++++++++++++++
> openssh_5.9p1.bb          |    9 +++++++++
> 2 files changed, 38 insertions(+)
> 
> diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
> new file mode 100755
> index 0000000..bb99a05
> --- /dev/null
> +++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
> @@ -0,0 +1,29 @@
> +#!/bin/sh
> +
> +cd regress
> +
> +make \
> +	.OBJDIR=`pwd` \
> +	.CURDIR=`pwd` \
> +	BUILDDIR=`pwd` \
> +	OBJ=`pwd` \
> +	PATH=$PATH:. \
> +	TEST_SHELL=sh \
> +	TEST_SSH_SSH=`which ssh` \
> +	TEST_SSH_SSHD=`which sshd` \
> +	TEST_SSH_SSHAGENT=`which ssh-agent` \
> +	TEST_SSH_SSHADD=`which ssh-add` \
> +	TEST_SSH_SSHKEYGEN=`which ssh-keygen` \
> +	TEST_SSH_SSHPKCS11HELPER="/usr/libexec/ssh-pkcs11-helper" \
> +	TEST_SSH_SSHKEYSCAN=`which ssh-keyscan` \
> +	TEST_SSH_SFTP=`which sftp` \
> +	TEST_SSH_SFTPSERVER="/usr/libexec/sftp-server" \
> +	TEST_SSH_PLINK="plink" \
> +	TEST_SSH_PUTTYGEN="puttygen" \
> +	TEST_SSH_CONCH="conch" \
> +	TEST_SSH_IPV6="yes" \
> +	TEST_SSH_ECC="yes" \
> +	TEST_SSH_SHA256="yes" \
> +	EXEEXT="" \
> +	tests
> +
> diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
> index 749f89e..f0880c0 100644
> --- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
> @@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
>            file://sshd_config \
>            file://ssh_config \
>            file://init \
> +           file://runtests.sh \
>            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
> 
> PAM_SRC_URI = "file://sshd"
> @@ -81,6 +82,9 @@ do_install_append () {
> 	mv ${D}${bindir}/ssh ${D}${bindir}/ssh.${PN}
> 	rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
> 	rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
> +	if [ ! -d ${D}/opt/${PN}-tests/ ]; then mkdir -p ${D}/opt/${PN}-tests/; fi
> +	install -m 755 ${WORKDIR}/runtests.sh ${D}/opt/${PN}-tests/
> +	cp -ra ${S}/regress ${D}/opt/${PN}-tests/

Don't use /opt, /opt is bad, bad, bad. Don't ever use it

> }
> 
> ALLOW_EMPTY_${PN} = "1"
> @@ -95,6 +99,11 @@ FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
> FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
> FILES_${PN}-keygen = "${bindir}/ssh-keygen"
> 
> +PACKAGES += "${PN}-testing"
> +DEPENDS_${PN}-testing += "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
> +FILES_${PN}-testing += "/opt/${PN}-tests/*"
> +FILES_${PN}-dbg += "/opt/${PN}-tests/.debug/*"

And it's missing a PR bump

Patch

diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
new file mode 100755
index 0000000..bb99a05
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
@@ -0,0 +1,29 @@ 
+#!/bin/sh
+
+cd regress
+
+make \
+	.OBJDIR=`pwd` \
+	.CURDIR=`pwd` \
+	BUILDDIR=`pwd` \
+	OBJ=`pwd` \
+	PATH=$PATH:. \
+	TEST_SHELL=sh \
+	TEST_SSH_SSH=`which ssh` \
+	TEST_SSH_SSHD=`which sshd` \
+	TEST_SSH_SSHAGENT=`which ssh-agent` \
+	TEST_SSH_SSHADD=`which ssh-add` \
+	TEST_SSH_SSHKEYGEN=`which ssh-keygen` \
+	TEST_SSH_SSHPKCS11HELPER="/usr/libexec/ssh-pkcs11-helper" \
+	TEST_SSH_SSHKEYSCAN=`which ssh-keyscan` \
+	TEST_SSH_SFTP=`which sftp` \
+	TEST_SSH_SFTPSERVER="/usr/libexec/sftp-server" \
+	TEST_SSH_PLINK="plink" \
+	TEST_SSH_PUTTYGEN="puttygen" \
+	TEST_SSH_CONCH="conch" \
+	TEST_SSH_IPV6="yes" \
+	TEST_SSH_ECC="yes" \
+	TEST_SSH_SHA256="yes" \
+	EXEEXT="" \
+	tests
+
diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
index 749f89e..f0880c0 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
@@ -23,6 +23,7 @@  SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
            file://sshd_config \
            file://ssh_config \
            file://init \
+           file://runtests.sh \
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
 
 PAM_SRC_URI = "file://sshd"
@@ -81,6 +82,9 @@  do_install_append () {
 	mv ${D}${bindir}/ssh ${D}${bindir}/ssh.${PN}
 	rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
 	rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
+	if [ ! -d ${D}/opt/${PN}-tests/ ]; then mkdir -p ${D}/opt/${PN}-tests/; fi
+	install -m 755 ${WORKDIR}/runtests.sh ${D}/opt/${PN}-tests/
+	cp -ra ${S}/regress ${D}/opt/${PN}-tests/
 }
 
 ALLOW_EMPTY_${PN} = "1"
@@ -95,6 +99,11 @@  FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
 FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
 FILES_${PN}-keygen = "${bindir}/ssh-keygen"
 
+PACKAGES += "${PN}-testing"
+DEPENDS_${PN}-testing += "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
+FILES_${PN}-testing += "/opt/${PN}-tests/*"
+FILES_${PN}-dbg += "/opt/${PN}-tests/.debug/*"
+
 RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
 DEPENDS_${PN}-sshd += "update-rc.d"
 RDEPENDS_${PN}-sshd += "update-rc.d ${PN}-keygen"