Remove the daemon pid file when exit is due to SIGTERM. Bug 340

[exim.git] / test / scripts / 2100-OpenSSL / 2113

diff --git a/test/scripts/2100-OpenSSL/2113 b/test/scripts/2100-OpenSSL/2113
index e483763a3d59f31426fdc5df0cbeedc62b663f9a..c1341e8577d134106d900acedbee99ca3cfcbe32 100644 (file)
--- a/test/scripts/2100-OpenSSL/2113
+++ b/test/scripts/2100-OpenSSL/2113
@@ -10,8 +10,42 @@ Test message 2
 exim userz@test.ex
 Test message 3
 ****
-exim -qqf -d-all+acl
+exim -d-all+acl -qqf
 ****
 killdaemon
 exim -DSERVER=server -DNOTDAEMON -qf
 ****
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim usera@test.ex
+Test message 1
+****
+exim userb@test.ex
+Test message 2
+****
+exim userc@test.ex
+Test message 3
+****
+exim -DEQUIRE -d-all+acl -qqf
+****
+killdaemon
+exim -DSERVER=server -DNOTDAEMON -qf
+****
+#
+#
+# no tls proxy (default for test was permitting proxy)
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim userx@test.ex
+Test message 1
+****
+exim usery@test.ex
+Test message 2
+****
+exim userz@test.ex
+Test message 3
+****
+exim -d-all+acl '-DPEX=*' -qqf
+****
+killdaemon