From 9f2b89fa772ea59bdeafd17e84d31ad764db8ba8 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Fri, 4 Feb 2022 11:55:46 +0100 Subject: [PATCH] Fix keyfromlabel test, missing status update Fix a missing status=$((status+ret)) in the keyfromlabel system test, which would ignore the error if ZSK key creation failed. (cherry picked from commit 7845f51178ba3ea0f68ab18c766c7255c710aed3) --- bin/tests/system/keyfromlabel/tests.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/keyfromlabel/tests.sh b/bin/tests/system/keyfromlabel/tests.sh index 247eefe688..4f6940af7b 100644 --- a/bin/tests/system/keyfromlabel/tests.sh +++ b/bin/tests/system/keyfromlabel/tests.sh @@ -65,13 +65,14 @@ do ret=0 zsk=$(keyfromlabel $alg $zone keyfromlabel-zsk) test -z "$zsk" && ret=1 + test "$ret" -eq 0 || echo_i "failed (zsk=$zsk)" + status=$((status+ret)) echo_i "Get KSK $alg $zone $type:$bits" ret=0 ksk=$(keyfromlabel $alg $zone keyfromlabel-ksk -f KSK) test -z "$ksk" && ret=1 - - test "$ret" -eq 0 || echo_i "failed (zsk=$zsk ksk=$ksk)" + test "$ret" -eq 0 || echo_i "failed (ksk=$ksk)" status=$((status+ret)) # Skip signing if dnssec-keyfromlabel failed.