diff options
author | Randy MacLeod <Randy.MacLeod@windriver.com> | 2022-11-02 17:17:42 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-11-07 08:39:05 -0800 |
commit | 66585ce7cab26f7a5bb1a7bb74b6ecb51a17c049 (patch) | |
tree | 7a3c00e1476ed926abcd44abed516a40c4b05f27 /meta-networking/recipes-filter | |
parent | 89653bab7189bfe82419ebaf12145a6f1616e67e (diff) | |
download | meta-openembedded-contrib-66585ce7cab26f7a5bb1a7bb74b6ecb51a17c049.tar.gz |
nftables: use automake ptest output format
Make run-ptest use the correct libdir for multilib builds.
Log the ptest output to a date stamped file and append a test summary
to the end of the log.
Munge the log as it is produced to:
- insert the expected automake keywords: PASS and FAIL.
- remove escape sequences used for ANSI colours as well as movement commands
Add additional discrete tool dependencies to the nftables-ptest list since
the test suite does not work with the busybox versions.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-filter')
-rw-r--r-- | meta-networking/recipes-filter/nftables/nftables/run-ptest | 17 | ||||
-rw-r--r-- | meta-networking/recipes-filter/nftables/nftables_1.0.5.bb | 4 |
2 files changed, 19 insertions, 2 deletions
diff --git a/meta-networking/recipes-filter/nftables/nftables/run-ptest b/meta-networking/recipes-filter/nftables/nftables/run-ptest index 611b844853..27d780ace0 100644 --- a/meta-networking/recipes-filter/nftables/nftables/run-ptest +++ b/meta-networking/recipes-filter/nftables/nftables/run-ptest @@ -1,2 +1,17 @@ #!/bin/sh -tests/shell/run-tests.sh -v + +NFTABLESLIB=@libdir@/nftables +cd ${NFTABLESLIB}/ptest + +LOG="${NFTABLESLIB}/ptest/nftables_ptest_$(date +%Y%m%d-%H%M%S).log" +tests/shell/run-tests.sh -v | sed -e '/OK/ s/^/PASS: / ; /FAILED/ s/^/FAIL: /' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tee -a ${LOG} + +passed=`grep PASS: ${LOG}|wc -l` +failed=`grep FAIL: ${LOG}|wc -l` +all=$((passed + failed)) + +( echo "=== Test Summary ===" + echo "TOTAL: ${all}" + echo "PASSED: ${passed}" + echo "FAILED: ${failed}" +) | tee -a ${LOG} diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.5.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.5.bb index 1708786f49..c5a2968d18 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.5.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.5.bb @@ -35,7 +35,7 @@ PACKAGES =+ "${PN}-python" FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" -RDEPENDS:${PN}-ptest += " ${PN}-python make bash python3-core python3-ctypes python3-json python3-misc util-linux" +RDEPENDS:${PN}-ptest += " ${PN}-python bash make iproute2 iputils-ping procps python3-core python3-ctypes python3-json python3-misc sed util-linux" TESTDIR = "tests" @@ -50,4 +50,6 @@ do_install_ptest() { cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest } |