summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2016-10-15 22:48:26 +0200
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2016-10-15 23:04:01 +0200
commitad42405613da5439cab19b4c713f000eb9cb1d2e (patch)
treea9a026ce6ea57731234b9bcc834d8096bc523cb1
parentc9fb699464874a5c8932d1766405244f89203102 (diff)
Testsuite: stabilize disk space/inode munging
-rwxr-xr-xtest/runtest6
-rw-r--r--test/stderr/00226
-rw-r--r--test/stderr/02752
-rw-r--r--test/stderr/02782
-rw-r--r--test/stderr/02942
-rw-r--r--test/stderr/03034
-rw-r--r--test/stderr/03172
-rw-r--r--test/stderr/03622
-rw-r--r--test/stderr/03714
-rw-r--r--test/stderr/03812
-rw-r--r--test/stderr/03866
-rw-r--r--test/stderr/03912
-rw-r--r--test/stderr/03962
-rw-r--r--test/stderr/04022
-rw-r--r--test/stderr/04032
-rw-r--r--test/stderr/04042
-rw-r--r--test/stderr/04082
-rw-r--r--test/stderr/04324
-rw-r--r--test/stderr/04642
-rw-r--r--test/stderr/04654
-rw-r--r--test/stderr/04712
-rw-r--r--test/stderr/04792
-rw-r--r--test/stderr/04872
-rw-r--r--test/stderr/04892
-rw-r--r--test/stderr/05752
-rw-r--r--test/stderr/22022
-rw-r--r--test/stderr/26006
-rw-r--r--test/stderr/50042
-rw-r--r--test/stderr/50052
-rw-r--r--test/stderr/50062
30 files changed, 40 insertions, 44 deletions
diff --git a/test/runtest b/test/runtest
index 71623a2f3..2c76f176b 100755
--- a/test/runtest
+++ b/test/runtest
@@ -758,10 +758,6 @@ RESET_AFTER_EXTRA_LINE_READ:
s/Delivered\s+\d+/Delivered nnn/;
- # ======== Values in spool space failure message ========
- s/space=\d+ inodes=[+-]?\d+/space=xxxxx inodes=xxxxx/;
-
-
# ======== Filter sizes ========
# The sizes of filter files may vary because of the substitution of local
# filenames, logins, etc.
@@ -1028,7 +1024,7 @@ RESET_AFTER_EXTRA_LINE_READ:
s/^cmd buf flush \d+ bytes$/cmd buf flush ddd bytes/;
# Spool filesystem free space changes on different systems.
- s/^((spool|log) directory space =) \d+K (inodes =) \d+/$1 nnnnnK $3 nnnnn/;
+ s/^((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/;
# When Exim is checking the size of directories for maildir, it uses
# the check_dir_size() function to scan directories. Of course, the order
diff --git a/test/stderr/0022 b/test/stderr/0022
index f054aa55d..75c282029 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -27,7 +27,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<warn_empty@test.ex>
using ACL "warn_empty"
@@ -96,7 +96,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<warn_log@test.ex>
using ACL "warn_log"
@@ -168,7 +168,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<warn_user@test.ex>
using ACL "warn_user"
diff --git a/test/stderr/0275 b/test/stderr/0275
index 32eb941e3..5f76af09a 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -128,7 +128,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
Recipients:
userx@test.ex
diff --git a/test/stderr/0278 b/test/stderr/0278
index 657ecb071..2d9967293 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -79,7 +79,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
Recipients:
CALLER@test.ex
diff --git a/test/stderr/0294 b/test/stderr/0294
index 590191625..c020fda0f 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -10,7 +10,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
SMTP>> 250 Accepted
diff --git a/test/stderr/0303 b/test/stderr/0303
index a5d98ee97..0a78b30f0 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -78,7 +78,7 @@ SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
250 HELP
SMTP<< mail from:<>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<x@y>
processing "accept"
@@ -154,7 +154,7 @@ SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
250 HELP
SMTP<< mail from:<>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<x@y>
processing "accept"
diff --git a/test/stderr/0317 b/test/stderr/0317
index 9f914d7fb..b71581e68 100644
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -4,7 +4,7 @@ admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
>>Headers received:
To: x@y.z
diff --git a/test/stderr/0362 b/test/stderr/0362
index 59066ac14..913901e15 100644
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -28,7 +28,7 @@ SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<x@a.b.c>
using ACL "check_rcpt"
diff --git a/test/stderr/0371 b/test/stderr/0371
index 0824ae85b..1cdf00177 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -45,7 +45,7 @@ SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
250 HELP
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
using ACL "mail"
processing "accept"
check set acl_c0 = $acl_c0; mail
@@ -124,7 +124,7 @@ LOG: MAIN
SMTP>> 550 <x@y> Unrouteable address
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
using ACL "mail"
processing "accept"
check set acl_c0 = $acl_c0; mail
diff --git a/test/stderr/0381 b/test/stderr/0381
index 0ae0c27d3..cd98205f2 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -29,7 +29,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<notgov@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<x@test.ex>
using ACL "check_rcpt"
diff --git a/test/stderr/0386 b/test/stderr/0386
index 6bcf40f7a..00094863b 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -30,7 +30,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<1@b>
read ACL from file TESTSUITE/aux-fixed/0386.acl1
@@ -79,7 +79,7 @@ SMTP<< rset
SMTP>> 250 Reset OK
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<1@b>
using ACL "TESTSUITE/aux-fixed/0386.acl1"
@@ -163,7 +163,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<2@b>
read ACL from file TESTSUITE/aux-fixed/0386.acl2
diff --git a/test/stderr/0391 b/test/stderr/0391
index b1151181b..783db01c5 100644
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -25,7 +25,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<U@W.x.y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+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"
diff --git a/test/stderr/0396 b/test/stderr/0396
index 7df2a2c8d..427b7b43a 100644
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -15,7 +15,7 @@ SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<x@y>
processing "accept"
diff --git a/test/stderr/0402 b/test/stderr/0402
index 5f88af295..96f012a15 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -20,7 +20,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
Recipients:
CALLER@test.ex
diff --git a/test/stderr/0403 b/test/stderr/0403
index ccb40a98f..716cabdf2 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -12,7 +12,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
Recipients:
userx@test.ex
diff --git a/test/stderr/0404 b/test/stderr/0404
index db58c0de6..d3d8f4c64 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -15,7 +15,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
Recipients:
userx
diff --git a/test/stderr/0408 b/test/stderr/0408
index 45bd3fe4b..f3d6d6b1a 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -12,7 +12,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
Recipients:
userx@test.ex
diff --git a/test/stderr/0432 b/test/stderr/0432
index e97e917fe..2fe0ca868 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -50,7 +50,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
using ACL "mail"
processing "accept"
check verify = sender/callout=1s,maxwait=1s
@@ -155,7 +155,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
using ACL "mail"
processing "accept"
check verify = sender/callout=1s,maxwait=1s
diff --git a/test/stderr/0464 b/test/stderr/0464
index 32160e76e..f5615411a 100644
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -17,7 +17,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<abc@domain1>
using ACL "rcpt"
diff --git a/test/stderr/0465 b/test/stderr/0465
index 69c9d0e93..92250956d 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -18,7 +18,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<abc@domain.>
LOG: smtp_syntax_error MAIN
@@ -51,7 +51,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<abc@domain.>
processing "accept"
diff --git a/test/stderr/0471 b/test/stderr/0471
index b03d6a0c6..bb67be2d4 100644
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -9,7 +9,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@myhost.test.ex
Recipients:
r1@test.ex
diff --git a/test/stderr/0479 b/test/stderr/0479
index 384ca1cde..9386dce11 100644
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -31,7 +31,7 @@ set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4]
SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4]
SMTP<< mail from:<a@b>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<c@d>
using ACL "rcpt"
diff --git a/test/stderr/0487 b/test/stderr/0487
index 25c8b5568..645687569 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -30,7 +30,7 @@ SMTP>> 250-myhost.test.ex Hello CALLER at x.y
250 HELP
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<userx@test.ex>
processing "accept"
diff --git a/test/stderr/0489 b/test/stderr/0489
index 654bf15da..d0caddc8e 100644
--- a/test/stderr/0489
+++ b/test/stderr/0489
@@ -5,7 +5,7 @@ admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil Q. Hazel"
sender address = CALLER@myhost.test.ex
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@myhost.test.ex
Recipients:
X
diff --git a/test/stderr/0575 b/test/stderr/0575
index 322fd57a3..86620a896 100644
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -24,7 +24,7 @@ SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<x@y>
processing "accept"
diff --git a/test/stderr/2202 b/test/stderr/2202
index 3c889f02e..45b039a59 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -24,7 +24,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<xx@cioce.test.again.dns>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<a@b>
using ACL "rcpt"
diff --git a/test/stderr/2600 b/test/stderr/2600
index 638e5c6e2..4e9974733 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -133,7 +133,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<a@b>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<c@d>
using ACL "check_recipient"
@@ -229,7 +229,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<a@b>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<c@d>
using ACL "check_recipient"
@@ -300,7 +300,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@myhost.test.ex
Recipients:
userx
diff --git a/test/stderr/5004 b/test/stderr/5004
index db77fe96a..ad5c9b331 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -14,7 +14,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
Recipients:
userx@test.ex
diff --git a/test/stderr/5005 b/test/stderr/5005
index 5e31754a5..8b28b7055 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -12,7 +12,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
Recipients:
nofile@test.ex
diff --git a/test/stderr/5006 b/test/stderr/5006
index 16d1e57dc..dce0d0050 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -12,7 +12,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
Sender: CALLER@test.ex
Recipients:
userx@test.ex