diff options
| -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 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | tests/shell/run-tests.sh -v | 2 | |
| 3 | NFTABLESLIB=@libdir@/nftables | ||
| 4 | cd ${NFTABLESLIB}/ptest | ||
| 5 | |||
| 6 | LOG="${NFTABLESLIB}/ptest/nftables_ptest_$(date +%Y%m%d-%H%M%S).log" | ||
| 7 | 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} | ||
| 8 | |||
| 9 | passed=`grep PASS: ${LOG}|wc -l` | ||
| 10 | failed=`grep FAIL: ${LOG}|wc -l` | ||
| 11 | all=$((passed + failed)) | ||
| 12 | |||
| 13 | ( echo "=== Test Summary ===" | ||
| 14 | echo "TOTAL: ${all}" | ||
| 15 | echo "PASSED: ${passed}" | ||
| 16 | echo "FAILED: ${failed}" | ||
| 17 | ) | 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" | |||
| 35 | FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" | 35 | FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" |
| 36 | RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" | 36 | RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" |
| 37 | 37 | ||
| 38 | RDEPENDS:${PN}-ptest += " ${PN}-python make bash python3-core python3-ctypes python3-json python3-misc util-linux" | 38 | RDEPENDS:${PN}-ptest += " ${PN}-python bash make iproute2 iputils-ping procps python3-core python3-ctypes python3-json python3-misc sed util-linux" |
| 39 | 39 | ||
| 40 | TESTDIR = "tests" | 40 | TESTDIR = "tests" |
| 41 | 41 | ||
| @@ -50,4 +50,6 @@ do_install_ptest() { | |||
| 50 | cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} | 50 | cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} |
| 51 | sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py | 51 | sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py |
| 52 | sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py | 52 | sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py |
| 53 | # handle multilib | ||
| 54 | sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest | ||
| 53 | } | 55 | } |
