@@ -1,53 +1,17 @@
#!/bin/sh
-# Valid tests to run
-tests="torture_bind_config \
- torture_buffer \
- torture_bytearray \
- torture_callbacks \
- torture_channel \
- torture_config \
- torture_crypto \
- torture_hashes \
- torture_init \
- torture_isipaddr \
- torture_keyfiles \
- torture_knownhosts_parsing \
- torture_list \
- torture_misc \
- torture_moduli \
- torture_options \
- torture_packet \
- torture_packet_filter \
- torture_pki \
- torture_pki_ecdsa \
- torture_pki_ed25519 \
- torture_pki_rsa \
- torture_push_pop_dir \
- torture_rand \
- torture_session_keys \
- torture_temp_dir \
- torture_temp_file \
- torture_threads_buffer \
- torture_threads_crypto \
- torture_threads_init \
- torture_threads_pki_rsa \
- torture_tokens \
- "
-
ptestdir=$(dirname "$(readlink -f "$0")")
cd "$ptestdir"/tests || exit
-# Run specified tests
+tests=$(find * -type f -name 'torture_*')
+
for f in $tests
do
- if test -e ./"$f"; then
+ if test -x ./"$f"; then
if ./"$f" > ./"$f".out 2> ./"$f".err; then
echo "PASS: $f"
else
echo "FAIL: $f"
fi
- else
- echo "SKIP: $f"
fi
done
similarity index 85%
rename from meta-oe/recipes-support/libssh/libssh_0.10.4.bb
rename to meta-oe/recipes-support/libssh/libssh_0.10.5.bb
@@ -11,7 +11,7 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable
file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \
file://run-ptest \
"
-SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85"
+SRCREV = "479eca13aaaa46b43e68c52186e3783f06ae6f34"
S = "${WORKDIR}/git"
@@ -34,12 +34,15 @@ EXTRA_OECMAKE = " \
do_compile:prepend () {
if [ ${PTEST_ENABLED} = "1" ]; then
sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/config.h
+ sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/config.h
fi
}
do_install_ptest () {
install -d ${D}${PTEST_PATH}/tests
cp -f ${B}/tests/unittests/torture_* ${D}${PTEST_PATH}/tests/
+ install -d ${D}${PTEST_PATH}/tests/unittests
+ cp -f ${S}/tests/unittests/hello*.sh ${D}${PTEST_PATH}/tests/unittests/
}
BBCLASSEXTEND = "native nativesdk"