diff options
| -rwxr-xr-x | meta/recipes-connectivity/openssh/openssh/run-ptest | 2 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_7.0p1.bb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest index 3e725cf282..564c0c8256 100755 --- a/meta/recipes-connectivity/openssh/openssh/run-ptest +++ b/meta/recipes-connectivity/openssh/openssh/run-ptest | |||
| @@ -3,5 +3,5 @@ | |||
| 3 | export TEST_SHELL=sh | 3 | export TEST_SHELL=sh |
| 4 | 4 | ||
| 5 | cd regress | 5 | cd regress |
| 6 | make -k .OBJDIR=`pwd` .CURDIR=`pwd` tests \ | 6 | make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ |
| 7 | | sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' | 7 | | 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 105875a60d..67abe577b5 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 () { | |||
| 79 | fi | 79 | fi |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | do_compile_ptest() { | ||
| 83 | # skip regress/unittests/ binaries: this will silently skip | ||
| 84 | # unittests in run-ptests which is good because they are so slow. | ||
| 85 | oe_runmake regress/modpipe regress/setuid-allowed regress/netcat | ||
| 86 | } | ||
| 87 | |||
| 82 | do_install_append () { | 88 | do_install_append () { |
| 83 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 89 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then |
| 84 | install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd | 90 | install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd |
