From c3541b903fed3d8bebefaf219e432e5162c54ede Mon Sep 17 00:00:00 2001 From: William Lyu Date: Tue, 2 Apr 2024 06:33:59 -0700 Subject: nftables: Fix ShellCheck violations in ptest wrapper script "run-ptest" The following ShellCheck violations in "run-ptest" are fixed: - line 4: SC2164: Use 'cd ... || exit' or 'cd ... || return' in case cd fails. - line 7: SC2086: Double quote to prevent globbing and word splitting. - line 9: SC2006: Use $(...) notation instead of legacy backticks `...`. SC2086: Double quote to prevent globbing and word splitting. SC2126: Consider using 'grep -c' instead of 'grep|wc -l'. - line 10: SC2006: Use $(...) notation instead of legacy backticks `...`. SC2086: Double quote to prevent globbing and word splitting. SC2126: Consider using 'grep -c' instead of 'grep|wc -l'. - line 17: SC2086: Double quote to prevent globbing and word splitting. Signed-off-by: William Lyu Signed-off-by: Khem Raj --- meta-networking/recipes-filter/nftables/nftables/run-ptest | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-networking') diff --git a/meta-networking/recipes-filter/nftables/nftables/run-ptest b/meta-networking/recipes-filter/nftables/nftables/run-ptest index 3217c743dd..363a1ee25a 100644 --- a/meta-networking/recipes-filter/nftables/nftables/run-ptest +++ b/meta-networking/recipes-filter/nftables/nftables/run-ptest @@ -1,17 +1,17 @@ #!/bin/sh NFTABLESLIB=@libdir@/nftables -cd ${NFTABLESLIB}/ptest +cd ${NFTABLESLIB}/ptest || exit 1 LOG="${NFTABLESLIB}/ptest/nftables_ptest_$(date +%Y%m%d-%H%M%S).log" -tests/shell/run-tests.sh -v | sed -E '/I: \[OK\]/ s/^/PASS: / ; /W: \[(CHK DUMP|VALGRIND|TAINTED|DUMP FAIL|FAILED)\]/ s/^/FAIL: /' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tee -a ${LOG} +tests/shell/run-tests.sh -v | sed -E '/I: \[OK\]/ s/^/PASS: / ; /W: \[(CHK DUMP|VALGRIND|TAINTED|DUMP FAIL|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` +passed=$(grep -c PASS: "${LOG}") +failed=$(grep -c FAIL: "${LOG}") all=$((passed + failed)) ( echo "=== Test Summary ===" echo "TOTAL: ${all}" echo "PASSED: ${passed}" echo "FAILED: ${failed}" -) | tee -a ${LOG} +) | tee -a "${LOG}" -- cgit v1.2.3-54-g00ecf