Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / mail / 5050.userz

diff --git a/test/mail/5050.userz b/test/mail/5050.userz
index 75b251f9f031bc5891e216e568423803a716ca02..3d717ee0596eeae15c00282dc0a138c0e6828032 100644 (file)
--- a/test/mail/5050.userz
+++ b/test/mail/5050.userz
@@ -4,9 +4,10 @@ Envelope-to: userz@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

-       id 10HmbA-0005vi-00
-       for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+       id 10HmbA-000000005vi-0000
+       for userz@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>

 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 


@@ -18,9 +19,10 @@ Envelope-to: mbx_userz@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000\r
 Received: from CALLER by the.local.host.name with local (Exim x.yz)\r
        (envelope-from <CALLER@test.ex>)\r
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000\r
 Received: from CALLER by the.local.host.name with local (Exim x.yz)\r
        (envelope-from <CALLER@test.ex>)\r

-       id 10HmbB-0005vi-00\r
-       for mbx_userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000\r
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>\r
+       id 10HmbB-000000005vi-0000\r
+       for mbx_userz@test.ex;\r
+       Tue, 2 Mar 1999 09:44:33 +0000\r
+Message-Id: <E10HmbB-000000005vi-0000@the.local.host.name>\r

 From: CALLER_NAME <CALLER@test.ex>\r
 Date: Tue, 2 Mar 1999 09:44:33 +0000\r
 \r
 From: CALLER_NAME <CALLER@test.ex>\r
 Date: Tue, 2 Mar 1999 09:44:33 +0000\r
 \r


@@ -31,9 +33,10 @@ Envelope-to: userz@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

-       id 10HmbC-0005vi-00
-       for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+       id 10HmbC-000000005vi-0000
+       for userz@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-000000005vi-0000@the.local.host.name>

 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000