summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-08-19 11:51:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-24 23:46:54 +0100
commitee80b725aa6b59ba59d38c710bd9e07950eb24f7 (patch)
treeacc1216df84e5842227734f1960b061489c3d452 /meta/recipes-connectivity
parent1993c1fd6c2ca5848dae3b0e070c36ed249b4612 (diff)
downloadpoky-ee80b725aa6b59ba59d38c710bd9e07950eb24f7.tar.gz
openssh: build regression test binaries
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 [YOCTO #8153] (From OE-Core rev: 1f7aaf76f4aa7875f05f4b838a5ec4594a4c35dc) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rwxr-xr-xmeta/recipes-connectivity/openssh/openssh/run-ptest2
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.0p1.bb6
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 @@
3export TEST_SHELL=sh 3export TEST_SHELL=sh
4 4
5cd regress 5cd regress
6make -k .OBJDIR=`pwd` .CURDIR=`pwd` tests \ 6make -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
82do_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
82do_install_append () { 88do_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