avahi: add ptest support
PATCH 1/1 avahi: add ptest support
Build avahi's upstream automake unit tests (via --enable-tests) and run the deterministic, non-interactive ones under ptest: the avahi-common (strlst, domain, alternative, timeval, utf8) and avahi-core (dns-spin, dns, hashmap) tests.
Tested on qemux86-64 with ptest-runner: 8 tests, all pass.
--- .../distro/include/ptest-packagelists.inc | 1 + meta/recipes-connectivity/avahi/avahi_0.9.bb | 31 ++++++++++++++++++- .../avahi/files/run-ptest | 12 +++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/avahi/files/run-ptest
meta/conf/distro/include/ptest-packagelists.inc +1 -0
@@ -7,6 +7,7 @@ PTESTS_FAST = "\ acl \ apr-util \ attr \ + avahi \ babeltrace2 \ bc \ bluez5 \
meta/recipes-connectivity/avahi/avahi_0.9.bb +30 -1
@@ -24,6 +24,7 @@ SRC_URI = "git://github.com/avahi/avahi;protocol=https;branch=master;tag=v0.9-rc file://avahi-daemon.in \ file://avahi-dnsconfd.in \ file://0001-Fix-opening-etc-resolv.conf-error.patch \ + file://run-ptest \ " PV = "0.9~rc5"
@@ -47,7 +48,7 @@ PACKAGECONFIG[libevent] = "--enable-libevent,--disable-libevent,libevent" PACKAGECONFIG[systemd] = "--enable-libsystemd,--disable-libsystemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[qt5] = "--enable-qt5,--disable-qt5,qtbase" -inherit autotools pkgconfig gettext gobject-introspection github-releases +inherit autotools pkgconfig gettext gobject-introspection github-releases ptest EXTRA_OECONF = " \ --runstatedir=${runtimedir} \
@@ -62,6 +63,7 @@ EXTRA_OECONF = " \ --disable-python \ --disable-doxygen-doc \ --disable-manpages \ + --enable-tests \ ${EXTRA_OECONF_SYSVINIT} \ "
@@ -79,6 +81,33 @@ do_compile:prepend() { RRECOMMENDS:${PN}:append:libc-glibc = " avahi-libnss-mdns" +AVAHI_PTESTS = " \ + avahi-common/strlst-test \ + avahi-common/domain-test \ + avahi-common/alternative-test \ + avahi-common/timeval-test \ + avahi-common/utf8-test \ + avahi-core/dns-spin-test \ + avahi-core/dns-test \ + avahi-core/hashmap-test \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + for t in ${AVAHI_PTESTS}; do + d=$(dirname $t) + n=$(basename $t) + if [ -x ${B}/$d/.libs/$n ]; then + install -m 0755 ${B}/$d/.libs/$n ${D}${PTEST_PATH}/tests/$n + else + install -m 0755 ${B}/$t ${D}${PTEST_PATH}/tests/$n + fi + done +} + +RDEPENDS:${PN}-ptest += "libavahi-common libavahi-core" +RDEPENDS:${PN}-ptest:remove = "${PN}" + do_install() { autotools_do_install
meta/recipes-connectivity/avahi/files/run-ptest new file +12 -0
@@ -0,0 +1,12 @@ +#!/bin/sh +# SPDX-License-Identifier: MIT + +cd "$(dirname "$0")/tests" || exit 1 + +for t in *; do + if ./"$t" >/dev/null 2>&1; then + echo "PASS: $t" + else + echo "FAIL: $t" + fi +done
Signature · 1 line
2.43.0
meta/recipes-connectivity/avahi/avahi_0.9.bb do_compile:prepend() { · line 104
Quoted 10 lines · Pratik Farkase via lists.openembedded.org
meta/recipes-connectivity/avahi/avahi_0.9.bb +10
-0+do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + for t in ${AVAHI_PTESTS}; do + d=$(dirname $t) + n=$(basename $t) + if [ -x ${B}/$d/.libs/$n ]; then + install -m 0755 ${B}/$d/.libs/$n ${D}${PTEST_PATH}/tests/$n + else + install -m 0755 ${B}/$t ${D}${PTEST_PATH}/tests/$n + fi
You can ask libtool to install and it handles this conditional for you:
${B}/libtool —mode=install install ${B}/$t …
meta/recipes-connectivity/avahi/files/run-ptest line 11
Quoted 6 lines
meta/recipes-connectivity/avahi/files/run-ptest new file +6
-0+for t in *; do + if ./"$t" >/dev/null 2>&1; then + echo "PASS: $t" + else + echo "FAIL: $t" + fi
Don’t redirect the output to /dev/null, if it fails we want to know why.
Ross
PATCH v2 1/1 avahi: add ptest support
In reply to Pratik FarkaseBuild avahi's upstream automake unit tests (via --enable-tests) and run the deterministic, non-interactive ones under ptest: the avahi-common (strlst, domain, alternative, timeval, utf8) and avahi-core (dns-spin, dns, hashmap) tests.
Tested on qemux86-64 with ptest-runner: 8 tests, all pass.
---
Notes:
Changes in v2:
- do_install_ptest: use 'libtool --mode=install' to install the test programs instead of hand-picking the binary from .libs.
- run-ptest: stop redirecting test output to /dev/null so failures can be diagnosed from the ptest log.
.../distro/include/ptest-packagelists.inc | 1 + meta/recipes-connectivity/avahi/avahi_0.9.bb | 28 ++++++++++++++++++- .../avahi/files/run-ptest | 12 ++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/avahi/files/run-ptest
meta/conf/distro/include/ptest-packagelists.inc +1 -0
@@ -7,6 +7,7 @@ PTESTS_FAST = "\ acl \ apr-util \ attr \ + avahi \ babeltrace2 \ bc \ bluez5 \
meta/recipes-connectivity/avahi/avahi_0.9.bb +25 -1
@@ -24,6 +24,7 @@ SRC_URI = "git://github.com/avahi/avahi;protocol=https;branch=master;tag=v0.9-rc file://avahi-daemon.in \ file://avahi-dnsconfd.in \ file://0001-Fix-opening-etc-resolv.conf-error.patch \ + file://run-ptest \ " PV = "0.9~rc5"
@@ -47,7 +48,7 @@ PACKAGECONFIG[libevent] = "--enable-libevent,--disable-libevent,libevent" PACKAGECONFIG[systemd] = "--enable-libsystemd,--disable-libsystemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[qt5] = "--enable-qt5,--disable-qt5,qtbase" -inherit autotools pkgconfig gettext gobject-introspection github-releases +inherit autotools pkgconfig gettext gobject-introspection github-releases ptest EXTRA_OECONF = " \ --runstatedir=${runtimedir} \
@@ -62,6 +63,7 @@ EXTRA_OECONF = " \ --disable-python \ --disable-doxygen-doc \ --disable-manpages \ + --enable-tests \ ${EXTRA_OECONF_SYSVINIT} \ "
@@ -79,6 +81,30 @@ do_compile:prepend() { RRECOMMENDS:${PN}:append:libc-glibc = " avahi-libnss-mdns" +AVAHI_PTESTS = " \ + avahi-common/strlst-test \ + avahi-common/domain-test \ + avahi-common/alternative-test \ + avahi-common/timeval-test \ + avahi-common/utf8-test \ + avahi-core/dns-spin-test \ + avahi-core/dns-test \ + avahi-core/hashmap-test \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + for t in ${AVAHI_PTESTS}; do + ${B}/libtool --mode=install install -m 0755 ${B}/$t \ + ${D}${PTEST_PATH}/tests/$(basename $t) + done +} + +RDEPENDS:${PN}-ptest += "libavahi-common libavahi-core" +RDEPENDS:${PN}-ptest:remove = "${PN}" + do_install() { autotools_do_install
meta/recipes-connectivity/avahi/files/run-ptest new file +12 -0
@@ -0,0 +1,12 @@ +#!/bin/sh +# SPDX-License-Identifier: MIT + +cd "$(dirname "$0")/tests" || exit 1 + +for t in *; do + if ./"$t"; then + echo "PASS: $t" + else + echo "FAIL: $t" + fi +done
Signature · 1 line
2.43.0