From b32ddfaa2ca5e305c1edfbbc8facc7b4d4f538b7 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 16 May 2012 00:22:01 +0100 Subject: Split out OpenSSL and GnuTLS versions of tests. --- test/scripts/5400-cutthrough/5402 | 24 ------------------------ test/scripts/5410-cutthrough-OpenSSL/5410 | 24 ++++++++++++++++++++++++ test/scripts/5410-cutthrough-OpenSSL/REQUIRES | 2 ++ test/scripts/5420-cutthrough-GnuTLS/5420 | 24 ++++++++++++++++++++++++ test/scripts/5420-cutthrough-GnuTLS/REQUIRES | 2 ++ 5 files changed, 52 insertions(+), 24 deletions(-) delete mode 100644 test/scripts/5400-cutthrough/5402 create mode 100644 test/scripts/5410-cutthrough-OpenSSL/5410 create mode 100644 test/scripts/5410-cutthrough-OpenSSL/REQUIRES create mode 100644 test/scripts/5420-cutthrough-GnuTLS/5420 create mode 100644 test/scripts/5420-cutthrough-GnuTLS/REQUIRES (limited to 'test/scripts') diff --git a/test/scripts/5400-cutthrough/5402 b/test/scripts/5400-cutthrough/5402 deleted file mode 100644 index d670abf4e..000000000 --- a/test/scripts/5400-cutthrough/5402 +++ /dev/null @@ -1,24 +0,0 @@ -# cutthrough_delivery to target oferring TLS -exim -DSERVER=server -bd -oX PORT_D -**** -exim -d-all+acl+transport+expand+lists -bs -EHLO myhost.test.ex -MAIL FROM: -RCPT TO: -DATA - -. -QUIT -**** -# via a transport setting never-tls -exim -d-all+acl+transport+expand+lists -bs -EHLO myhost.test.ex -MAIL FROM: -RCPT TO: -DATA - -. -QUIT -**** -killdaemon -no_msglog_check diff --git a/test/scripts/5410-cutthrough-OpenSSL/5410 b/test/scripts/5410-cutthrough-OpenSSL/5410 new file mode 100644 index 000000000..d670abf4e --- /dev/null +++ b/test/scripts/5410-cutthrough-OpenSSL/5410 @@ -0,0 +1,24 @@ +# cutthrough_delivery to target oferring TLS +exim -DSERVER=server -bd -oX PORT_D +**** +exim -d-all+acl+transport+expand+lists -bs +EHLO myhost.test.ex +MAIL FROM: +RCPT TO: +DATA + +. +QUIT +**** +# via a transport setting never-tls +exim -d-all+acl+transport+expand+lists -bs +EHLO myhost.test.ex +MAIL FROM: +RCPT TO: +DATA + +. +QUIT +**** +killdaemon +no_msglog_check diff --git a/test/scripts/5410-cutthrough-OpenSSL/REQUIRES b/test/scripts/5410-cutthrough-OpenSSL/REQUIRES new file mode 100644 index 000000000..9e2124e10 --- /dev/null +++ b/test/scripts/5410-cutthrough-OpenSSL/REQUIRES @@ -0,0 +1,2 @@ +support OpenSSL +running IPv4 diff --git a/test/scripts/5420-cutthrough-GnuTLS/5420 b/test/scripts/5420-cutthrough-GnuTLS/5420 new file mode 100644 index 000000000..d670abf4e --- /dev/null +++ b/test/scripts/5420-cutthrough-GnuTLS/5420 @@ -0,0 +1,24 @@ +# cutthrough_delivery to target oferring TLS +exim -DSERVER=server -bd -oX PORT_D +**** +exim -d-all+acl+transport+expand+lists -bs +EHLO myhost.test.ex +MAIL FROM: +RCPT TO: +DATA + +. +QUIT +**** +# via a transport setting never-tls +exim -d-all+acl+transport+expand+lists -bs +EHLO myhost.test.ex +MAIL FROM: +RCPT TO: +DATA + +. +QUIT +**** +killdaemon +no_msglog_check diff --git a/test/scripts/5420-cutthrough-GnuTLS/REQUIRES b/test/scripts/5420-cutthrough-GnuTLS/REQUIRES new file mode 100644 index 000000000..d21ee471d --- /dev/null +++ b/test/scripts/5420-cutthrough-GnuTLS/REQUIRES @@ -0,0 +1,2 @@ +support GnuTLS +running IPv4 -- cgit v1.2.3