summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtest/runtest4
-rw-r--r--test/scripts/4200-International/42001
-rw-r--r--test/stdout/42005
3 files changed, 8 insertions, 2 deletions
diff --git a/test/runtest b/test/runtest
index 6b5a3e9d9..3016e5df6 100755
--- a/test/runtest
+++ b/test/runtest
@@ -899,6 +899,10 @@ RESET_AFTER_EXTRA_LINE_READ:
# gnutls version variances
next if /^Error in the pull function./;
+
+ # optional IDN2 variant conversions. Accept either IDN1 or IDN2
+ s/conversion strasse.de/conversion xn--strae-oqa.de/;
+ s/conversion: german.xn--strae-oqa.de/conversion: german.straße.de/;
}
# ======== stderr ========
diff --git a/test/scripts/4200-International/4200 b/test/scripts/4200-International/4200
index dd5348ea3..81fbae865 100644
--- a/test/scripts/4200-International/4200
+++ b/test/scripts/4200-International/4200
@@ -50,6 +50,7 @@ golden: trad.chinese.xn--ihqwctvzc91f659drss3x8bo0yb.com
original czech.\x50\x72\x6F\xC4\x8D\x70\x72\x6F\x73\x74\xC4\x9B\x6E\x65\x6D\x6C\x75\x76\xC3\xAD\xC4\x8D\x65\x73\x6B\x79.com
conversion: ${utf8_domain_to_alabel:czech.Pro\xC4\x8Dprost\xC4\x9Bnemluv\xC3\xAD\xC4\x8Desky.com}
+golden: czech.xn--Proprostnemluvesky-uyb24dma41a.com
original hebrew.\xD7\x9C\xD7\x9E\xD7\x94\xD7\x94\xD7\x9D\xD7\xA4\xD7\xA9\xD7\x95\xD7\x98\xD7\x9C\xD7\x90\xD7\x9E\xD7\x93\xD7\x91\xD7\xA8\xD7\x99\xD7\x9D\xD7\xA2\xD7\x91\xD7\xA8\xD7\x99\xD7\xAA.com
conversion: ${utf8_domain_to_alabel:hebrew.\xD7\x9C\xD7\x9E\xD7\x94\xD7\x94\xD7\x9D\xD7\xA4\xD7\xA9\
diff --git a/test/stdout/4200 b/test/stdout/4200
index 91e8ea144..af39676df 100644
--- a/test/stdout/4200
+++ b/test/stdout/4200
@@ -41,6 +41,7 @@
>
> original czech.Pročprostěnemluvíčesky.com
> conversion: czech.xn--proprostnemluvesky-uyb24dma41a.com
+> golden: czech.xn--Proprostnemluvesky-uyb24dma41a.com
>
> original hebrew.למההםפשוטלאמדבריםעברית.com
> conversion: hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com
@@ -73,7 +74,7 @@
> golden: vietnamese.xn--TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g.com
>
> original straße.de
-> conversion strasse.de
+> conversion xn--strae-oqa.de
> golden: xn--strae-oqa.de
>
> a-label domain to utf-8:
@@ -90,7 +91,7 @@
> conversion: russian.почемужеонинеговорятпорусски.com
> conversion: spanish.PorquénopuedensimplementehablarenEspañol.com
> conversion: vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.com
-> conversion: german.xn--strae-oqa.de
+> conversion: german.straße.de
>
> ===========
>