diff options
| -rwxr-xr-x | meta/recipes-connectivity/openssh/openssh/run-ptest | 8 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_9.2p1.bb | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest index 8a9b770d59c..18cfbaf3a80 100755 --- a/meta/recipes-connectivity/openssh/openssh/run-ptest +++ b/meta/recipes-connectivity/openssh/openssh/run-ptest @@ -16,14 +16,14 @@ if [ -z "${SSHAGENT}" -o -z "${GDB}" ]; then exit fi -useradd openssh-test +useradd ptest -eval `su -c "${SSHAGENT} -s" openssh-test` > /dev/null +eval `su -c "${SSHAGENT} -s" ptest` > /dev/null r=$? if [ $r -ne 0 ]; then echo "FAIL: could not start ssh-agent: exit code $r" else - su -c "gdb -p ${SSH_AGENT_PID}" openssh-test > /tmp/gdb.out 2>&1 << EOF + su -c "gdb -p ${SSH_AGENT_PID}" ptest > /tmp/gdb.out 2>&1 << EOF quit EOF r=$? @@ -41,5 +41,5 @@ EOF ${SSHAGENT} -k > /dev/null fi -userdel openssh-test +userdel ptest diff --git a/meta/recipes-connectivity/openssh/openssh_9.2p1.bb b/meta/recipes-connectivity/openssh/openssh_9.2p1.bb index e6cf2ff2d6b..92af73ab859 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.2p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.2p1.bb @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=072979064e691d342002f43cd89c0394" DEPENDS = "zlib openssl virtual/crypt" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +# The tests need to run as a non-root user, so pull in the ptest user +DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://sshd_config \ @@ -158,7 +160,7 @@ FILES:${PN}-keygen = "${bindir}/ssh-keygen" RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen ${PN}-sftp-server" RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies -RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" +RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils ptest-runner" RPROVIDES:${PN}-ssh = "ssh" RPROVIDES:${PN}-sshd = "sshd" |