Commit 9c5547b1 authored by Michał Kępień's avatar Michał Kępień

Merge branch 'michal/fix-the-dnssec-system-test-on-windows' into 'master'

Fix the "dnssec" system test on Windows

See merge request !2902
parents aac87369 451484b8
Pipeline #31674 canceled with stages
...@@ -108,11 +108,12 @@ stripns () { ...@@ -108,11 +108,12 @@ stripns () {
# Ensure there is not a blank line before "Secure roots:". # Ensure there is not a blank line before "Secure roots:".
# #
check_secroots_layout () { check_secroots_layout () {
tr -d '\r' < "$1" | \
awk '$0 == "" { if (empty) exit(1); empty=1; next } awk '$0 == "" { if (empty) exit(1); empty=1; next }
/Start view/ { if (!empty) exit(1) } /Start view/ { if (!empty) exit(1) }
/Secure roots:/ { if (empty) exit(1) } /Secure roots:/ { if (empty) exit(1) }
/Negative trust anchors:/ { if (!empty) exit(1) } /Negative trust anchors:/ { if (!empty) exit(1) }
{ empty=0 }' $1 { empty=0 }'
return $? return $?
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment