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

Fix the "dnssec" system test on Windows

Make sure carriage return characters are stripped from awk input to
enable the "dnssec" system test to pass on Windows.

(cherry picked from commit 451484b8)
parent ddaeb2ce
Pipeline #30913 canceled with stages
in 28 seconds
...@@ -120,11 +120,12 @@ stripns () { ...@@ -120,11 +120,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