diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2025-01-26 09:28:21 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2025-01-26 09:58:22 +0100 |
| commit | 899e5a80d67610af1ee9c2d0231a9a23ba3248e1 (patch) | |
| tree | 4804cec80e30b42df4c27f6673a7ecc694c64c7d | |
| parent | 053818b242d531f2b3394e766038e9843d71e4a1 (diff) | |
CI: Fixed config tests
* set max dots per line to improve CI output
* commented `flow_risk.crawler_bot.list.load` out
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | test/configs/unusual-ndpi.conf | 3 | ||||
| -rwxr-xr-x | test/run_config_tests.sh | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/test/configs/unusual-ndpi.conf b/test/configs/unusual-ndpi.conf index 0864c0f8d..115118eb1 100644 --- a/test/configs/unusual-ndpi.conf +++ b/test/configs/unusual-ndpi.conf @@ -22,7 +22,8 @@ dpi.compute_entropy = 1 fpc = enable dpi.guess_on_giveup = 0x01 flow_risk_lists.load = 1 -flow_risk.crawler_bot.list.load = 1 +# Currently broken (upstream) +#flow_risk.crawler_bot.list.load = 1 log.level = 3 [protos] diff --git a/test/run_config_tests.sh b/test/run_config_tests.sh index 2f86fb75e..464547f28 100755 --- a/test/run_config_tests.sh +++ b/test/run_config_tests.sh @@ -75,7 +75,7 @@ EOF if ! `ls -l cfgs/*/pcap/*.pcap cfgs/*/pcap/*.pcapng cfgs/*/pcap/*.cap >/dev/null 2>/dev/null`; then printf '\n%s\n' "Could not find any PCAP files." - exit 7 + exit 6 fi mkdir -p /tmp/nDPId-cfgtest-stderr @@ -90,9 +90,11 @@ if [ $? -ne 1 ]; then exit 7 fi +DOTS_PER_LINE=80 for cfg_file in ${MYDIR}/configs/*.conf; do cfg_name="$(basename ${cfg_file})" printf 'Config: %s\n' "${cfg_name}" + DOTS=0 for pcap_file in cfgs/*/pcap/*.pcap cfgs/*/pcap/*.pcapng cfgs/*/pcap/*.cap; do if [ ! -r "${pcap_file}" ]; then printf '%s: %s\n' "${0}" "${pcap_file} does not exist!" @@ -112,7 +114,13 @@ for cfg_file in ${MYDIR}/configs/*.conf; do nDPId_test_RETVAL=$? if [ ${nDPId_test_RETVAL} -eq 0 ]; then - printf '%s' '.' + DOTS=$((DOTS + 1)) + if [ ${DOTS} -eq ${DOTS_PER_LINE} ]; then + printf '%s\n' '.' + DOTS=0 + else + printf '%s' '.' + fi else printf '%s\n' '[FAIL]' printf '%s\n' '----------------------------------------' @@ -120,6 +128,7 @@ for cfg_file in ${MYDIR}/configs/*.conf; do cat "${stderr_file}" test -r "/tmp/nDPId-test-stderr/${pcap_name}.strace.out" && cat "/tmp/nDPId-test-stderr/${pcap_name}.strace.out" TESTS_FAILED=$((TESTS_FAILED + 1)) + test ${TESTS_FAILED} -eq 0 || exit ${TESTS_FAILED} fi done |