Attempt (2) egrep compat for Solaris vs. Linux

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

diff --git a/test/mail/0324.userx b/test/mail/0324.userx
index 08c14924d94cb99c3cff8c58ab679a11dab5c4b8..370be29c4fde7f5b1f0fc798ca3b9ff4713fcb33 100644 (file)
--- a/test/mail/0324.userx
+++ b/test/mail/0324.userx
@@ -1,10 +1,9 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaX-0005vi-00
-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+       id 10HmaX-000000005vi-0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa


@@ -663,7 +662,9 @@ X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   This is the final line which should get chopped.
 X-Long: This is another header with the same name.   
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   This is the final line which should get chopped.
 X-Long: This is another header with the same name.   

+Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

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

 X-match: NO
 Y-match: NO
 Z-match: NO
 X-match: NO
 Y-match: NO
 Z-match: NO