Testsuite: deal better with -bt output and long test-system ipv4 addresses

[exim.git] / test / stdout / 1009

diff --git a/test/stdout/1009 b/test/stdout/1009
index 29bbc4aa388ee30ee41a93a5ea31c4a9f4ed51e7..ccda782f582f974eee086adaae23b4c9eae84632 100644 (file)
--- a/test/stdout/1009
+++ b/test/stdout/1009
@@ -1,32 +1,32 @@
 x@46.test.ex
   router = r1, transport = t1
-  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] ad=no
-  host 46.test.ex [V4NET.0.0.4] ad=no
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031]
+  host 46.test.ex [V4NET.0.0.4] 
 x@mx46.test.ex
   router = r1, transport = t1
-  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no
-  host 46.test.ex [V4NET.0.0.4] MX=46 ad=no
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
+  host 46.test.ex [V4NET.0.0.4] MX=46
 x@mx246.test.ex
   router = r1, transport = t1
-  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=10 ad=no
-  host ten-1.test.ex [V4NET.0.0.1] MX=10 ad=no
+  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=10
+  host ten-1.test.ex [V4NET.0.0.1] MX=10
 x@mx4646.test.ex
   router = r1, transport = t1
-  host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46 ad=no
-  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no
-  host 46b.test.ex [V4NET.0.0.5] MX=46 ad=no
-  host 46.test.ex [V4NET.0.0.4] MX=46 ad=no
+  host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
+  host 46b.test.ex [V4NET.0.0.5] MX=46
+  host 46.test.ex [V4NET.0.0.4] MX=46
 x@mx46466.test.ex
   router = r1, transport = t1
-  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=46 ad=no
-  host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46 ad=no
-  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no
-  host 46b.test.ex [V4NET.0.0.5] MX=46 ad=no
-  host 46.test.ex [V4NET.0.0.4] MX=46 ad=no
+  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=46
+  host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
+  host 46b.test.ex [V4NET.0.0.5] MX=46
+  host 46.test.ex [V4NET.0.0.4] MX=46
 x@mx46466b.test.ex
   router = r1, transport = t1
-  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no
-  host 46.test.ex [V4NET.0.0.4] MX=46 ad=no
-  host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=47 ad=no
-  host 46b.test.ex [V4NET.0.0.5] MX=47 ad=no
-  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=48 ad=no
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
+  host 46.test.ex [V4NET.0.0.4] MX=46
+  host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=47
+  host 46b.test.ex [V4NET.0.0.5] MX=47
+  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=48