diff --git a/meta-networking/conf/include/ptest-packagelists-meta-networking.inc b/meta-networking/conf/include/ptest-packagelists-meta-networking.inc index 9bbae5ac91..ec0592f9a9 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 \ + tinyproxy \ unbound \ wolfssl \ " diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/run-ptest b/meta-networking/recipes-support/tinyproxy/tinyproxy/run-ptest new file mode 100644 index 0000000000..267a975c24 --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh +RET=0 +cd tests/scripts +if ./run_tests.sh; then + echo PASS: run_tests.sh +else + echo FAIL: run_tests.sh + RET=1 +fi +exit $RET diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb index e386d39cdc..222cc8d7c6 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb @@ -7,6 +7,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz file://disable-documentation.patch \ file://tinyproxy.service \ file://tinyproxy.conf \ + file://run-ptest \ file://CVE-2025-63938.patch \ " @@ -22,7 +23,7 @@ EXTRA_OECONF += " \ --enable-xtinyproxy \ " -inherit autotools systemd useradd +inherit autotools systemd useradd ptest #User specific USERADD_PACKAGES = "${PN}" @@ -40,3 +41,26 @@ do_install:append() { fi install -m 0644 ${UNPACKDIR}/tinyproxy.conf ${D}${sysconfdir}/tinyproxy.conf } + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/scripts + install -d ${D}${PTEST_PATH}/data/templates + install ${S}/tests/scripts/*.sh ${D}${PTEST_PATH}/tests/scripts + install ${S}/tests/scripts/*.pl ${D}${PTEST_PATH}/tests/scripts + install -m 0644 ${S}/data/templates/*.html ${D}${PTEST_PATH}/data/templates/ + # test the installed binary, not the one that was just compiled in the src folder + sed -i 's,TINYPROXY_BIN=.*,TINYPROXY_BIN=tinyproxy,' ${D}${PTEST_PATH}/tests/scripts/run_tests.sh +} + +RDEPENDS:${PN}-ptest += "\ + perl \ + perl-module-cwd \ + perl-module-encode-encoding \ + perl-module-file-spec \ + perl-module-getopt-long \ + perl-module-io-socket \ + perl-module-io-socket-inet \ + perl-module-pod-text \ + perl-module-posix \ + procps \ +"