Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0467

diff --git a/test/stderr/0467 b/test/stderr/0467
index fdf48df3100f3f95731b131143b488fb2d2e6158..c7658714e8b008592903c81d78277db5478ee058 100644 (file)
--- a/test/stderr/0467
+++ b/test/stderr/0467
@@ -1,22 +1,23 @@
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss

-delivering 10HmaX-0005vi-00
+delivering 10HmaX-000000005vi-0000

 LOG: MAIN
   *> x@srv01.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]:25 C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 LOG: MAIN
   *> x@srv01.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]:25 C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss

-delivering 10HmaY-0005vi-00
+delivering 10HmaY-000000005vi-0000

 LOG: MAIN
   *> x@srv03.test.ex R=r1 T=t1 H=ten-4.test.ex [V4NET.0.0.4]:88 C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 LOG: MAIN
   *> x@srv03.test.ex R=r1 T=t1 H=ten-4.test.ex [V4NET.0.0.4]:88 C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss

-delivering 10HmaZ-0005vi-00
-Transport port=25 replaced by host-specific port=1224
-Connecting to localhost.test.ex [127.0.0.1]:1224 ...  connected
+delivering 10HmaZ-000000005vi-0000
+Transport port=25 replaced by host-specific port=PORT_S
+Connecting to localhost.test.ex [127.0.0.1]:PORT_S ...
+connected

   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-server id
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-server id


@@ -27,11 +28,15 @@ Connecting to localhost.test.ex [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP>> DATA
   SMTP<< 354 OK
   SMTP<< 250 OK
   SMTP>> DATA
   SMTP<< 354 OK

-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP>> .
+  SMTP<< 250 OK
+  SMTP+> QUIT
+  SMTP(shutdown)>>

   SMTP<< 250 OK
   SMTP<< 250 OK

-  SMTP>> QUIT

   SMTP(close)>>
   SMTP(close)>>

+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250'

 LOG: MAIN
 LOG: MAIN

-  => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224 C="250 OK"
+  => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:PORT_S C="250 OK"

 LOG: MAIN
   Completed
 LOG: MAIN
   Completed