Sync 4.next from master

[users/jgh/exim.git] / test / runtest

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./;
 
     # 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 ========
     }
 
   # ======== stderr ========