git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt egrep compat for Solaris vs. Linux
[exim.git]
/
test
/
stderr
/
0332
diff --git
a/test/stderr/0332
b/test/stderr/0332
index b717038d9eb16a6d6c4b30c40e47ada131852d3b..54cd5d8d24a0a4a17f6ea188cead99806eb05d7d 100644
(file)
--- a/
test/stderr/0332
+++ b/
test/stderr/0332
@@
-33,17
+33,12
@@
After routing:
Failed addresses:
Deferred addresses:
cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
Failed addresses:
Deferred addresses:
cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+qrun-delivery becomes continued-delivery
LOG: MAIN
=> ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
LOG: MAIN
Completed
LOG: MAIN
=> ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-Hints DB:
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@test.again.dns
unique = delay@test.again.dns
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@test.again.dns
unique = delay@test.again.dns
@@
-61,7
+56,6
@@
checking domains
calling r1 router
r1 router called for ok@no.delay
domain = no.delay
calling r1 router
r1 router called for ok@no.delay
domain = no.delay
-set transport t1
queued for t1 transport: local_part = ok
domain = no.delay
errors_to=NULL
queued for t1 transport: local_part = ok
domain = no.delay
errors_to=NULL
@@
-78,9
+72,10
@@
After routing:
Deferred addresses:
delay@test.again.dns
cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'
Deferred addresses:
delay@test.again.dns
cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
LOG: MAIN
=> ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
->>>>>>>>>>>>>>>> Exim pid=p123
6 (continued-transport
) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p123
7 (continued-delivery
) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@test.again.dns
unique = delay@test.again.dns
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@test.again.dns
unique = delay@test.again.dns
@@
-93,7
+88,7
@@
After routing:
Failed addresses:
Deferred addresses:
delay@test.again.dns
Failed addresses:
Deferred addresses:
delay@test.again.dns
->>>>>>>>>>>>>>>> Exim pid=p123
7
(qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p123
8
(qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1234
>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1234
>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>