Testsuite: fix scripts for daemon interlock

Broken-by: f41e05066084

diff --git a/test/README b/test/README
index 00bac50245162c6384f08bf96cd9dd4bcf6b5c44..2a3fa00c8ec29309f8bdc2b2299e15145c114e62 100644 (file)
--- 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.
 
 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>]
 
 
   exim_exim [<options>] [<arguments>]
 

diff --git a/test/log/4201 b/test/log/4201
index 717beb29519a5c145dca159ee9d0585c2fab236b..5a2740c8713d5beb05b63f0c418bfa236cee8e73 100644 (file)
--- 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 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 010a71ac70b3157c8ffe75156c8531185b936008..f2b796de09f42e652608e27d34c327da48bbb191 100644 (file)
--- 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 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 17362ac9d50ac7b2aeace434eecf141e9c90eb3e..3d7441af3d9a3be4fb5f877dcea02a25b765dd48 100644 (file)
--- 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 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 beffdd164b8f3e9551d8844ccf6c04112f9c673b..29e51a9dbc028578f35872e0a3dd79bf20feaab5 100644 (file)
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -71,6 +71,6 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 killdaemon

-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 no_msglog_check
 ****
 no_msglog_check

diff --git a/test/scripts/4200-International/4202 b/test/scripts/4200-International/4202
index 629f98e083650f3afb8bd33ed3073671a10ac484..4e0ae469d69304247818a36dd7f1e3f236dc7aff 100644 (file)
--- a/test/scripts/4200-International/4202
+++ b/test/scripts/4200-International/4202
@@ -23,6 +23,6 @@ Test message 3.
 #
 #
 killdaemon
 #
 #
 killdaemon

-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 no_msglog_check
 ****
 no_msglog_check

diff --git a/test/scripts/4200-International/4204 b/test/scripts/4200-International/4204
index 5f00f56bae7ed2c11567e5aacf34a852ae91ee78..3063f5ac3a10b9bf17f7e498958304e6f4f11b08 100644 (file)
--- a/test/scripts/4200-International/4204
+++ b/test/scripts/4200-International/4204
@@ -30,7 +30,7 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 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 193aad427a814a75b9db567391e3abf9225049f0..4c558f40515e307137c2a28bf75ab114b5eccebd 100644 (file)
--- a/test/scripts/4200-International/4206
+++ b/test/scripts/4200-International/4206
@@ -30,7 +30,7 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 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 66e77f0a9691d072c468772bf170cb745078ef9c..cbfa5cca3b34e92d007f1780dbae355df6987b87 100644 (file)
--- a/test/scripts/4200-International/4207
+++ b/test/scripts/4200-International/4207
@@ -19,6 +19,6 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 killdaemon

-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 no_msglog_check
 ****
 no_msglog_check

diff --git a/test/scripts/4200-International/4209 b/test/scripts/4200-International/4209
index 6531103b9f7d4583ea9ef04c25ccdef563bc24ed..366a21b32360e1ec181a53735039a1e923906507 100644 (file)
--- a/test/scripts/4200-International/4209
+++ b/test/scripts/4200-International/4209
@@ -14,7 +14,7 @@ Test message 1.
 #
 #
 killdaemon
 #
 #
 killdaemon

-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 #
 #
 ****
 #
 #


@@ -32,7 +32,7 @@ Test message 1.
 #
 #
 killdaemon
 #
 #
 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 46efae44fab9290d9de0bb8dda124f6c36008eb3..8fa9fd3bc601d7bbefe03f6e2b7c9642c17b6bf6 100644 (file)
--- a/test/scripts/4210-GnuTLS-International/4211
+++ b/test/scripts/4210-GnuTLS-International/4211
@@ -76,6 +76,6 @@ QUIT
 #
 #
 killdaemon
 #
 #
 killdaemon

-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 no_msglog_check
 ****
 no_msglog_check

diff --git a/test/scripts/4210-GnuTLS-International/4214 b/test/scripts/4210-GnuTLS-International/4214
index 04d6d93c193b1a7856876aeb987b218b1ac0c0e0..245c8a4dc94eb920d019844d9a2d447eec05ab7e 100644 (file)
--- a/test/scripts/4210-GnuTLS-International/4214
+++ b/test/scripts/4210-GnuTLS-International/4214
@@ -31,7 +31,7 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 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 976615facf68c379f4594f2721f7c2e0d4daa225..f6e49496e3a69ec23b2f5069868cbf6fffc64945 100644 (file)
--- a/test/scripts/4210-GnuTLS-International/4216
+++ b/test/scripts/4210-GnuTLS-International/4216
@@ -31,7 +31,7 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 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 f2a45848f2c354a0abeb47305354596ccbfaa025..4a5b3ab383dc978c02631e936d9ab33ef203b4b5 100644 (file)
--- a/test/scripts/4220-OpenSSL-International/4224
+++ b/test/scripts/4220-OpenSSL-International/4224
@@ -30,7 +30,7 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 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 9e493f40ab8b07631d8826df3e58b71b2110b193..0fc4b560a40fcd74a8c0413718c1a015be921414 100644 (file)
--- a/test/scripts/4220-OpenSSL-International/4226
+++ b/test/scripts/4220-OpenSSL-International/4226
@@ -30,7 +30,7 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 killdaemon

-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 #
 #
 ****
 #
 #