Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / mail / 0137.userx

diff --git a/test/mail/0137.userx b/test/mail/0137.userx
index c4469825411d68c693957bb83ef74e3e19add8c2..559accc3dd5f0f7733a9748029c41ce85a47b247 100644 (file)
--- a/test/mail/0137.userx
+++ b/test/mail/0137.userx
@@ -1,52 +1,60 @@
-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From t1@foo Tue Mar 02 09:44:33 1999

 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       (envelope-from <t1@foo>)
+       id 10HmaX-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Subject: First
 Subject: First

-Transport: local_delivery
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-From: CALLER_NAME <CALLER@test.ex>
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
+From: CALLER_NAME <t1@foo>
+Sender: CALLER_NAME <CALLER@test.ex>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

+local_delivery

 First message.
 
 First message.
 

-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From t1@foo Tue Mar 02 09:44:33 1999

 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
-       id 10HmaY-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       (envelope-from <t1@foo>)
+       id 10HmaY-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Subject: Second
 Subject: Second

-Transport: local_delivery
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-From: CALLER_NAME <CALLER@test.ex>
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
+From: CALLER_NAME <t1@foo>
+Sender: CALLER_NAME <CALLER@test.ex>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

+local_delivery

 Second message
 
 Second message
 

-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From t2@foo Tue Mar 02 09:44:33 1999

 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
-       id 10HmaZ-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       (envelope-from <t2@foo>)
+       id 10HmaZ-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Subject: Third
 Subject: Third

-Transport: local_delivery_fcntl
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-From: CALLER_NAME <CALLER@test.ex>
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
+From: CALLER_NAME <t2@foo>
+Sender: CALLER_NAME <CALLER@test.ex>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

+local_delivery_fcntl

 Third message
 
 Third message
 

-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From t3@foo Tue Mar 02 09:44:33 1999

 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
-       id 10HmbA-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       (envelope-from <t3@foo>)
+       id 10HmbA-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Subject: Fourth
 Subject: Fourth

-Transport: local_delivery_fcntl_blocking
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-From: CALLER_NAME <CALLER@test.ex>
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
+From: CALLER_NAME <t3@foo>
+Sender: CALLER_NAME <CALLER@test.ex>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

+local_delivery_fcntl_blocking

 Fourth message
 
 Fourth message