Testsuite: enhance IDNA examples; move to IDNA-2008 conversions

diff --git a/test/runtest b/test/runtest
index 6b5a3e9d957384489785e26025643be9c9bbc4cf..3016e5df64f9abb67a1d0107f9d373cbed15791b 100755 (executable)
--- 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 dd5348ea32dcd8cad1f10c3d239f143900e06194..81fbae865b0bf965f3ab7619bae9cdc498e2af39 100644 (file)
--- 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 91e8ea1447d83dae19a5c5605469ddb910f100a4..af39676df02c5c8023b6fcd8e0517d5adad10aba 100644 (file)
--- 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
 > 
 > ===========
 >