tidying

[exim.git] / test / scripts / 1100-Basic-TLS / 1115

diff --git a/test/scripts/1100-Basic-TLS/1115 b/test/scripts/1100-Basic-TLS/1115
index d74caca5281476b525f176bf4fac4ccd4762a785..fe53cb15d23c52c3f27e0b18914ef0ab677e75a5 100644 (file)
--- a/test/scripts/1100-Basic-TLS/1115
+++ b/test/scripts/1100-Basic-TLS/1115
@@ -1,50 +1,7 @@
-# TLS: ALPN
-gnutls
-exim -DSERVER=server -bd -oX PORT_D
+# server: tls_on_connect and log_reject_target empty
+exim -bd -DSERVER=server -oX PORT_D2
 ****
-#
-# Basic: is good ALPN set on tpt acceptable to server
-exim -DCONTROL=smtp -odf a@test.ex
-Test message.
-****
-#
-# Bad ALPN rejected
-exim -DCONTROL=http -odf b@test.ex
-****
-exim -Mrm $msg1
-****
-sudo rm -f DIR/spool/db/retry
-#
-# Multiple ALPN rejected
-exim -DCONTROL=smtp:smtp -odf c@test.ex
-****
-exim -Mrm $msg1
-****
-sudo rm -f DIR/spool/db/retry
-#
-# Empty client option is ok
-exim -DCONTROL="" -odf d@test.ex
-****
-# Content-free client option is ok
-exim -DCONTROL=" " -odf e@test.ex
-****
-killdaemon
-#
-# Server can be told to ignore (bad) ALPN from client
-exim -DSERVER=server -DSTRICT="" -bd -oX PORT_D
-****
-exim -DCONTROL=http -odf f@test.ex
-****
-killdaemon
-#
-# Server can be told custom names list
-exim -DSERVER=server -DSTRICT='${if eq {$sender_host_address}{HOSTIPV4} {smtp:weird} {smtp}}' -bd -oX PORT_D
-****
-exim -DCONTROL=weird -odf g@test.ex
+client-anytls -tls-on-connect 127.0.0.1 PORT_D2
+???*
 ****
 killdaemon
-#
-#
-no_msglog_check
-no_stdout_check
-millisleep 500