tidying

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

diff --git a/test/runtest b/test/runtest
index 6b5a3e9d957384489785e26025643be9c9bbc4cf..1ee61a5a1c7622a47e0c351ba99a21833337a996 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 ========
@@ -1141,13 +1145,6 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if / Berkeley DB error: /;
     }
 
-  elsif ($is_mail)
-    {
-    # Experimental_DSN info in bounces
-    next if /^Remote-MTA: /;
-    next if /^X-Exim-Diagnostic: /;
-    }
-
   # ======== All files other than stderr ========
 
   print MUNGED;