From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.windriver.com ([147.11.1.11]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Sumab-0008Lc-0F for openembedded-core@lists.openembedded.org; Fri, 27 Jul 2012 17:36:29 +0200 Received: from yow-afong-lx2.ottawa.windriver.com (yow-afong-lx2.wrs.com [128.224.146.164]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id q6RFOt2B022485 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Fri, 27 Jul 2012 08:24:56 -0700 (PDT) Received: from afong by yow-afong-lx2.ottawa.windriver.com with local (Exim 4.80) (envelope-from ) id 1SumPO-0001U9-Mp for openembedded-core@lists.openembedded.org; Fri, 27 Jul 2012 11:24:54 -0400 Date: Fri, 27 Jul 2012 11:24:54 -0400 From: Amy Fong To: Openembedded core Message-ID: <20120727152454.GA5706@windriver.com> MIME-Version: 1.0 User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [PATCH] openssh: package testing X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2012 15:36:29 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline openssh: package testing Package openssh's regression tests Signed-off-by: Amy Fong --- 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/ } 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"