Merge branch 'rspamd-removal'

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

diff --git a/test/scripts/2100-OpenSSL/2190 b/test/scripts/2100-OpenSSL/2190
index bacca676d568b8572536b7daeebcf5f91cfe98ad..e004e5e020139f1c72d6d218bebac1c9051bbe40 100644 (file)
--- a/test/scripts/2100-OpenSSL/2190
+++ b/test/scripts/2100-OpenSSL/2190
@@ -1,5 +1,5 @@
 # TLS server, CHUNKING reception
 # TLS server, CHUNKING reception

-exim -DSERVER=server -DY=tls -bd -oX PORT_D
+exim -DSERVER=server -DSRV=tls -bd -oX PORT_D

 ****
 #
 # non-piplined
 ****
 #
 # non-piplined


@@ -24,7 +24,7 @@ EHLO rhu.barb
 ??? 250 HELP
 MAIL FROM:<someone@some.domain>
 ??? 250
 ??? 250 HELP
 MAIL FROM:<someone@some.domain>
 ??? 250

-RCPT TO:<CALLER@HOSTNAME>
+RCPT TO:<CALLER@test.ex>

 ??? 250
 BDAT 88 LAST
 To: Susan@random.com
 ??? 250
 BDAT 88 LAST
 To: Susan@random.com


@@ -57,13 +57,7 @@ EHLO rhu.barb
 ??? 250-PIPELINING
 ??? 250-CHUNKING
 ??? 250 HELP
 ??? 250-PIPELINING
 ??? 250-CHUNKING
 ??? 250 HELP

-MAIL FROM:<someone@some.domain>
-RCPT TO:<CALLER@HOSTNAME>
-BDAT 88 LAST
-To: Susan@random.com
-From: Sam@random.com
-Subject: This is a bodyless test message
-
+MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n

 ??? 250
 ??? 250
 ??? 250-
 ??? 250
 ??? 250
 ??? 250-