From 2ee1e363083e587e31d8839152fcc7cfd8c234ce Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Mon, 19 Jun 2023 13:53:26 +0200 Subject: [PATCH] Handle non-zero return codes in zero test (cherry picked from commit 69e8876966e41df35dd09602279cd3077e3c2d6c) --- bin/tests/system/zero/tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/zero/tests.sh b/bin/tests/system/zero/tests.sh index f02d4fc432..f5e2038815 100644 --- a/bin/tests/system/zero/tests.sh +++ b/bin/tests/system/zero/tests.sh @@ -50,7 +50,7 @@ do (dig_with_opts -d +qr @10.53.0.3 -f query.list > "dig.out$i.6.test$n" 2>&1) & pid6="$!" retry_quiet "$timeout" wait_for_pid "$pid1" "$pid2" "$pid3" "$pid4" "$pid5" "$pid6" || { echo_i "wait_for_pid failed"; ret=1; } - kill -TERM "$pid1" "$pid2" "$pid3" "$pid4" "$pid5" "$pid6" 2>/dev/null + kill -TERM "$pid1" "$pid2" "$pid3" "$pid4" "$pid5" "$pid6" 2>/dev/null || true wait "$pid1" || { echo_i "wait $pid1 (dig.out$i.1.test$n) failed with $?"; ret=1; } wait "$pid2" || { echo_i "wait $pid2 (dig.out$i.2.test$n) failed with $?"; ret=1; }