diff options
| -rw-r--r-- | meta-oe/recipes-support/libssh2/files/run-ptest | 5 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/libssh2/files/run-ptest b/meta-oe/recipes-support/libssh2/files/run-ptest index 2a7922f1aa..c213b32e5f 100644 --- a/meta-oe/recipes-support/libssh2/files/run-ptest +++ b/meta-oe/recipes-support/libssh2/files/run-ptest | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | 2 | ||
| 3 | ptestdir=$(dirname "$(readlink -f "$0")") | 3 | ptestdir=$(dirname "$(readlink -f "$0")") |
| 4 | for test in $(ls $ptestdir/tests) | 4 | cd tests |
| 5 | for test in $(ls) | ||
| 5 | do | 6 | do |
| 6 | ./test-driver --test-name $test --log-file $test.log --trs-file $test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./tests/$test | 7 | ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test |
| 7 | done | 8 | done |
diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index a1d85617a6..38f1626935 100644 --- a/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb | |||
| @@ -28,7 +28,9 @@ PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGI | |||
| 28 | 28 | ||
| 29 | BBCLASSEXTEND = "native nativesdk" | 29 | BBCLASSEXTEND = "native nativesdk" |
| 30 | 30 | ||
| 31 | RDEPENDS_${PN}-ptest = "bash" | 31 | # required for ptest on documentation |
| 32 | RDEPENDS_${PN}-ptest = "man-db" | ||
| 33 | RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us" | ||
| 32 | 34 | ||
| 33 | do_compile_ptest() { | 35 | do_compile_ptest() { |
| 34 | sed -i "/\$(MAKE) \$(AM_MAKEFLAGS) check-TESTS/d" tests/Makefile | 36 | sed -i "/\$(MAKE) \$(AM_MAKEFLAGS) check-TESTS/d" tests/Makefile |
| @@ -40,4 +42,6 @@ do_install_ptest() { | |||
| 40 | install -m 0755 ${B}/tests/.libs/simple ${D}${PTEST_PATH}/tests/ | 42 | install -m 0755 ${B}/tests/.libs/simple ${D}${PTEST_PATH}/tests/ |
| 41 | install -m 0755 ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ | 43 | install -m 0755 ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ |
| 42 | install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ | 44 | install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ |
| 45 | mkdir -p ${D}${PTEST_PATH}/docs | ||
| 46 | cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ | ||
| 43 | } | 47 | } |
