Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0217

diff --git a/test/stderr/0217 b/test/stderr/0217
index 3885a352ceed6ce17a381b0197062cb00315498b..c03f53a2d6f3aa3376d89e626e2f97daa0ee26df 100644 (file)
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -1,7 +1,8 @@
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss

-delivering 10HmbL-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+delivering 10HmbL-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected

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


@@ -823,8 +824,8 @@ LOG: MAIN
 LOG: MAIN
   ** n199@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n199@test.ex>: 550 NO
 LOG: MAIN
 LOG: MAIN
   ** n199@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n199@test.ex>: 550 NO
 LOG: MAIN

-  <= <> R=10HmbL-0005vi-00 U=EXIMUSER P=local S=sss
-delivering 10HmbM-0005vi-00
+  <= <> R=10HmbL-000000005vi-0000 U=EXIMUSER P=local S=sss
+delivering 10HmbM-000000005vi-0000

 LOG: MAIN
   ** CALLER@test.ex R=bounce: just discard
 LOG: MAIN
 LOG: MAIN
   ** CALLER@test.ex R=bounce: just discard
 LOG: MAIN


@@ -833,8 +834,9 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
   Completed
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss

-delivering 10HmbP-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+delivering 10HmbP-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected

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


@@ -858,7 +860,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(shutdown)>>
   SMTP(closed)<<
   SMTP(close)>>
   SMTP(shutdown)>>
   SMTP(closed)<<
   SMTP(close)>>

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

 LOG: MAIN
   => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
 LOG: MAIN
   => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN