Testsuite: fix scripts for daemon interlock

Broken-by: f41e05066084

15 files changed, 26 insertions, 12 deletions

diff --git a/test/README b/test/README
index 00bac5024..2a3fa00c8 100644
--- a/test/README
+++ b/test/README
@@ -887,6 +887,11 @@ example:
 Finally, "exim" can be preceded by "sudo", to run Exim as root. If more than
 one of these prefixes is present, they must be in the above order.
 
+If the options include "-DSERVER" but not "-DNOTDAEMON", the script waits for
+Exim to start but then continues without waiting for it to terminate. Typically
+this will be for a daemon-mode "-bd" operation.  The daemon should be later
+terminated using "killdaemon".
+
 
   exim_exim [<options>] [<arguments>]
 
diff --git a/test/log/4201 b/test/log/4201
index 717beb295..5a2740c87 100644
--- a/test/log/4201
+++ b/test/log/4201
@@ -10,3 +10,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qqff
diff --git a/test/log/4202 b/test/log/4202
index 010a71ac7..f2b796de0 100644
--- a/test/log/4202
+++ b/test/log/4202
@@ -16,3 +16,6 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <user.他们为什么不说中文@test.ex> R=localuser
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qqff
diff --git a/test/log/4211 b/test/log/4211
index 17362ac9d..3d7441af3 100644
--- a/test/log/4211
+++ b/test/log/4211
@@ -10,3 +10,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qqff
diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index beffdd164..29e51a9db 100644
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -71,6 +71,6 @@ QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 no_msglog_check
diff --git a/test/scripts/4200-International/4202 b/test/scripts/4200-International/4202
index 629f98e08..4e0ae469d 100644
--- a/test/scripts/4200-International/4202
+++ b/test/scripts/4200-International/4202
@@ -23,6 +23,6 @@ Test message 3.
 #
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 no_msglog_check
diff --git a/test/scripts/4200-International/4204 b/test/scripts/4200-International/4204
index 5f00f56ba..3063f5ac3 100644
--- a/test/scripts/4200-International/4204
+++ b/test/scripts/4200-International/4204
@@ -30,7 +30,7 @@ QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 #
 #
diff --git a/test/scripts/4200-International/4206 b/test/scripts/4200-International/4206
index 193aad427..4c558f405 100644
--- a/test/scripts/4200-International/4206
+++ b/test/scripts/4200-International/4206
@@ -30,7 +30,7 @@ QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 #
 #
diff --git a/test/scripts/4200-International/4207 b/test/scripts/4200-International/4207
index 66e77f0a9..cbfa5cca3 100644
--- a/test/scripts/4200-International/4207
+++ b/test/scripts/4200-International/4207
@@ -19,6 +19,6 @@ QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 no_msglog_check
diff --git a/test/scripts/4200-International/4209 b/test/scripts/4200-International/4209
index 6531103b9..366a21b32 100644
--- a/test/scripts/4200-International/4209
+++ b/test/scripts/4200-International/4209
@@ -14,7 +14,7 @@ Test message 1.
 #
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 #
 #
@@ -32,7 +32,7 @@ Test message 1.
 #
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 #
 #
diff --git a/test/scripts/4210-GnuTLS-International/4211 b/test/scripts/4210-GnuTLS-International/4211
index 46efae44f..8fa9fd3bc 100644
--- a/test/scripts/4210-GnuTLS-International/4211
+++ b/test/scripts/4210-GnuTLS-International/4211
@@ -76,6 +76,6 @@ QUIT
 #
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 no_msglog_check
diff --git a/test/scripts/4210-GnuTLS-International/4214 b/test/scripts/4210-GnuTLS-International/4214
index 04d6d93c1..245c8a4dc 100644
--- a/test/scripts/4210-GnuTLS-International/4214
+++ b/test/scripts/4210-GnuTLS-International/4214
@@ -31,7 +31,7 @@ QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 #
 #
diff --git a/test/scripts/4210-GnuTLS-International/4216 b/test/scripts/4210-GnuTLS-International/4216
index 976615fac..f6e49496e 100644
--- a/test/scripts/4210-GnuTLS-International/4216
+++ b/test/scripts/4210-GnuTLS-International/4216
@@ -31,7 +31,7 @@ QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 #
 #
diff --git a/test/scripts/4220-OpenSSL-International/4224 b/test/scripts/4220-OpenSSL-International/4224
index f2a45848f..4a5b3ab38 100644
--- a/test/scripts/4220-OpenSSL-International/4224
+++ b/test/scripts/4220-OpenSSL-International/4224
@@ -30,7 +30,7 @@ QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 #
 #
diff --git a/test/scripts/4220-OpenSSL-International/4226 b/test/scripts/4220-OpenSSL-International/4226
index 9e493f40a..0fc4b560a 100644
--- a/test/scripts/4220-OpenSSL-International/4226
+++ b/test/scripts/4220-OpenSSL-International/4226
@@ -30,7 +30,7 @@ QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 #
 #