git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DKIM: permit dkim_private_key to override dkim_strict on signing. Bug 2220
[users/heiko/exim.git]
/
test
/
stderr
/
0378
diff --git
a/test/stderr/0378
b/test/stderr/0378
index d82f049a720899416f32b74776faa2aec27b24e3..fad082573cc8186cd9c3538551004e251f6c3f1a 100644
(file)
--- a/
test/stderr/0378
+++ b/
test/stderr/0378
@@
-1,10
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-12,10
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-129,20
+121,12
@@
locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-171,8
+155,8
@@
After routing:
Deferred addresses:
LOG: MAIN
Completed
Deferred addresses:
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(main)
terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(main)
terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
=> >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3
locking TESTSUITE/spool/db/retry.lockfile
@@
-183,15
+167,11
@@
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
=> TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
=> TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1
locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(main)
terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(main)
terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
@@
-329,4
+309,4
@@
After routing:
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
End queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(main)
terminating with rc=0 >>>>>>>>>>>>>>>>