Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0391

diff --git a/test/stderr/0391 b/test/stderr/0391
index 326807765008a2be6b066c52af8a04a2e3aa5ea8..884ffd32aedd0422124cb9dd9dc8bba873c8c812 100644 (file)
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -1,10 +1,11 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]
@@ -22,17 +23,32 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [1.2.3.4]
+sender_rcvhost = [1.2.3.4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [1.2.3.4]
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]
 SMTP<< mail from:<U@W.x.y>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<B@a.b.c>
 using ACL "acl_rcpt"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 18)
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying U@W.x.y
-address match test: subject=U@w.x.y pattern=*@*.x.y
-w.x.y in "*.x.y"? yes (matched "*.x.y")
-U@W.x.y in "*@*.x.y"? yes (matched "*@*.x.y")
+U@W.x.y in "*@*.x.y"?
+ list element: *@*.x.y
+ address match test: subject=U@w.x.y pattern=*@*.x.y
+ w.x.y in "*.x.y"?
+  list element: *.x.y
+  w.x.y in "*.x.y"? yes (matched "*.x.y")
+ U@W.x.y in "*@*.x.y"? yes (matched "*@*.x.y")
 LOG: address_rewrite MAIN
   "U@W.x.y" from env-from rewritten as "U@x.y" by rule 1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -48,7 +64,7 @@ r1 router called for U@x.y
 queued for <unset> transport: local_part = u
 domain = x.y
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r1 router
   envelope to: U@x.y
   transport: <none>
@@ -60,6 +76,6 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from [1.2.3.4] closed by QUIT
+  SMTP connection from (test) [1.2.3.4] D=qqs closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>