Merge branch '1465-fix-idna-system-test' into 'master'

Fix the "idna" system test

See merge request isc-projects/bind9!2740
This commit is contained in:
Michał Kępień
2019-12-10 10:57:02 +00:00

View File

@@ -252,16 +252,19 @@ idna_enabled_test() {
# is displayed as the corresponding A-label.
#
# The "+[no]idnout" flag has no effect in these cases.
saved_LC_ALL="${LC_ALL}"
LC_ALL="C"
text="Checking valid A-label in C locale"
label="xn--nxasmq6b.com"
if command -v idn2 >/dev/null && ! LC_ALL=C idn2 -d "$label" >/dev/null 2>/dev/null; then
LC_ALL=C idna_test "$text" "" "$label" "$label."
LC_ALL=C idna_test "$text" "+noidnin +noidnout" "$label" "$label."
LC_ALL=C idna_test "$text" "+noidnin +idnout" "$label" "$label."
LC_ALL=C idna_test "$text" "+idnin +noidnout" "$label" "$label."
LC_ALL=C idna_test "$text" "+idnin +idnout" "$label" "$label."
LC_ALL=C idna_test "$text" "+noidnin +idnout" "$label" "$label."
if command -v idn2 >/dev/null && ! idn2 -d "$label" >/dev/null 2>/dev/null; then
idna_test "$text" "" "$label" "$label."
idna_test "$text" "+noidnin +noidnout" "$label" "$label."
idna_test "$text" "+noidnin +idnout" "$label" "$label."
idna_test "$text" "+idnin +noidnout" "$label" "$label."
idna_test "$text" "+idnin +idnout" "$label" "$label."
idna_test "$text" "+noidnin +idnout" "$label" "$label."
fi
LC_ALL="${saved_LC_ALL}"