diff --git a/meta-networking/conf/include/ptest-packagelists-meta-networking.inc b/meta-networking/conf/include/ptest-packagelists-meta-networking.inc index 838aee94d3..9bbae5ac91 100644 --- a/meta-networking/conf/include/ptest-packagelists-meta-networking.inc +++ b/meta-networking/conf/include/ptest-packagelists-meta-networking.inc @@ -23,6 +23,7 @@ PTESTS_FAST_META_NETWORKING = "\ python3-scapy \ squid \ tcpdump \ + unbound \ wolfssl \ " PTESTS_FAST_META_NETWORKING:remove:libc-musl = "\ diff --git a/meta-networking/recipes-support/unbound/unbound/run-ptest b/meta-networking/recipes-support/unbound/unbound/run-ptest index 433a687c65..3801233eeb 100644 --- a/meta-networking/recipes-support/unbound/unbound/run-ptest +++ b/meta-networking/recipes-support/unbound/unbound/run-ptest @@ -2,15 +2,27 @@ cd tests || exit 1 retVal=0 -./unittest -./testbound -s +if ./unittest; then + echo PASS: unittest +else + echo FAIL: unittest + retVal=1 +fi + +if ./testbound -s; then + echo PASS: testbound selftest +else + echo FAIL: testbound selftest + retVal=1 +fi + for x in ./testdata/*.rpl; do output="$(./testbound -p $x -o -vvvvv 2>&1)" if test $? -eq 0; then - echo "$x :Pass" + echo "PASS: $x" else echo "$output" - echo "$x :Fail" + echo "FAIL: $x" retVal=1 fi done diff --git a/meta-networking/recipes-support/unbound/unbound_1.24.2.bb b/meta-networking/recipes-support/unbound/unbound_1.24.2.bb index 4ae8db4d08..e41e2dc065 100644 --- a/meta-networking/recipes-support/unbound/unbound_1.24.2.bb +++ b/meta-networking/recipes-support/unbound/unbound_1.24.2.bb @@ -47,8 +47,11 @@ do_install:append() { } do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests install -d ${D}${PTEST_PATH}/tests/testdata + install -d ${D}${PTEST_PATH}/sources/${BP} + # unittests are looking for the data in the source folder, though it's the + # same data used by the other tests + ln -sr ${D}${PTEST_PATH}/tests ${D}${PTEST_PATH}/sources/${BP}/testdata install -m 0544 ${B}/unittest ${D}${PTEST_PATH}/tests/ install -m 0544 ${B}/testbound ${D}${PTEST_PATH}/tests/ @@ -56,7 +59,10 @@ do_install_ptest() { install -m 0664 ${S}/testdata/test_sigs* ${D}${PTEST_PATH}/tests/ install -m 0664 ${S}/testdata/test_ds* ${D}${PTEST_PATH}/tests/ install -m 0664 ${S}/testdata/test_nsec3_hash* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_ldnsrr* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/zonemd.example* ${D}${PTEST_PATH}/tests/ install -m 0644 ${S}/testdata/*.rpl ${D}/${PTEST_PATH}/tests/testdata/ + } SYSTEMD_SERVICE:${PN} = "${BPN}.service"