Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / mail / 0386.2

diff --git a/test/mail/0386.2 b/test/mail/0386.2
index d320a6751a5a93b44dab41fecdd6c621ac89037b..1880cd7b05bca759e2627ef3f88ba29c07663073 100644 (file)
--- a/test/mail/0386.2
+++ b/test/mail/0386.2
@@ -1,20 +1,22 @@
 From x@y Tue Mar 02 09:44:33 1999
 From x@y Tue Mar 02 09:44:33 1999

-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)

-       id 10HmaX-0005vi-00
-       for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaX-000000005vi-0000
+       for 2@b;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
 X-Warning: This is a test blacklisting message
 
 Message 1
 
 From x@y Tue Mar 02 09:44:33 1999
 X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
 X-Warning: This is a test blacklisting message
 
 Message 1
 
 From x@y Tue Mar 02 09:44:33 1999

-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)

-       id 10HmaY-0005vi-00
-       for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000
+       for 2@b;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
 X-Warning: This is a test blacklisting message
 
 X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
 X-Warning: This is a test blacklisting message