From 360c049264151071203aee2f957472321ff0dc41 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 14 Aug 2014 20:47:31 +0100 Subject: Shuffle test order --- test/scripts/5800-DANE-GnuTLS/5800 | 14 -------------- test/scripts/5800-DANE-GnuTLS/REQUIRES | 3 --- test/scripts/5800-DANE/5800 | 12 ++++++++++++ test/scripts/5800-DANE/REQUIRES | 2 ++ test/scripts/5820-DANE-GnuTLS/5820 | 14 ++++++++++++++ test/scripts/5820-DANE-GnuTLS/REQUIRES | 3 +++ test/scripts/5840-DANE-OpenSSL/5840 | 30 ++++++++++++++++++++++++++++++ test/scripts/5840-DANE-OpenSSL/REQUIRES | 3 +++ test/scripts/5850-DANE-OpenSSL/5850 | 30 ------------------------------ test/scripts/5850-DANE-OpenSSL/REQUIRES | 3 --- test/scripts/5890-DANE/5890 | 12 ------------ test/scripts/5890-DANE/REQUIRES | 2 -- 12 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 test/scripts/5800-DANE-GnuTLS/5800 delete mode 100644 test/scripts/5800-DANE-GnuTLS/REQUIRES create mode 100644 test/scripts/5800-DANE/5800 create mode 100644 test/scripts/5800-DANE/REQUIRES create mode 100644 test/scripts/5820-DANE-GnuTLS/5820 create mode 100644 test/scripts/5820-DANE-GnuTLS/REQUIRES create mode 100644 test/scripts/5840-DANE-OpenSSL/5840 create mode 100644 test/scripts/5840-DANE-OpenSSL/REQUIRES delete mode 100644 test/scripts/5850-DANE-OpenSSL/5850 delete mode 100644 test/scripts/5850-DANE-OpenSSL/REQUIRES delete mode 100644 test/scripts/5890-DANE/5890 delete mode 100644 test/scripts/5890-DANE/REQUIRES (limited to 'test/scripts') diff --git a/test/scripts/5800-DANE-GnuTLS/5800 b/test/scripts/5800-DANE-GnuTLS/5800 deleted file mode 100644 index 07ad7406d..000000000 --- a/test/scripts/5800-DANE-GnuTLS/5800 +++ /dev/null @@ -1,14 +0,0 @@ -# DANE client: general -# -gnutls -# -exim -DSERVER=server -bd -oX PORT_D -**** -exim CALLER@test.ex -Testing -**** -exim -qf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/5800-DANE-GnuTLS/REQUIRES b/test/scripts/5800-DANE-GnuTLS/REQUIRES deleted file mode 100644 index 4234c92f8..000000000 --- a/test/scripts/5800-DANE-GnuTLS/REQUIRES +++ /dev/null @@ -1,3 +0,0 @@ -support Experimental_DANE -support GnuTLS -running IPv4 diff --git a/test/scripts/5800-DANE/5800 b/test/scripts/5800-DANE/5800 new file mode 100644 index 000000000..98a70c115 --- /dev/null +++ b/test/scripts/5800-DANE/5800 @@ -0,0 +1,12 @@ +# Expansion test for DANE. +# +# Some systems seem to use 1-byte fields for the leading +# 3 fields in a TLSA record, others 2-bytes. +# We need the result to match the string in dnszones-src/db.test.ex + +exim -be + +dnslookup tlsa: ${lookup dnsdb {tlsa=_1225._tcp.dane512ee.test.ex} \ + {$value}{none}} + +**** diff --git a/test/scripts/5800-DANE/REQUIRES b/test/scripts/5800-DANE/REQUIRES new file mode 100644 index 000000000..2314a3236 --- /dev/null +++ b/test/scripts/5800-DANE/REQUIRES @@ -0,0 +1,2 @@ +support Experimental_DANE +running IPv4 diff --git a/test/scripts/5820-DANE-GnuTLS/5820 b/test/scripts/5820-DANE-GnuTLS/5820 new file mode 100644 index 000000000..07ad7406d --- /dev/null +++ b/test/scripts/5820-DANE-GnuTLS/5820 @@ -0,0 +1,14 @@ +# DANE client: general +# +gnutls +# +exim -DSERVER=server -bd -oX PORT_D +**** +exim CALLER@test.ex +Testing +**** +exim -qf +**** +killdaemon +exim -DSERVER=server -DNOTDAEMON -qf +**** diff --git a/test/scripts/5820-DANE-GnuTLS/REQUIRES b/test/scripts/5820-DANE-GnuTLS/REQUIRES new file mode 100644 index 000000000..4234c92f8 --- /dev/null +++ b/test/scripts/5820-DANE-GnuTLS/REQUIRES @@ -0,0 +1,3 @@ +support Experimental_DANE +support GnuTLS +running IPv4 diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840 new file mode 100644 index 000000000..814b4b0e8 --- /dev/null +++ b/test/scripts/5840-DANE-OpenSSL/5840 @@ -0,0 +1,30 @@ +# DANE client: general +# +exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D +**** +# TLSA (3 1 1) +exim CALLER@dane256ee.test.ex +Testing +**** +# TLSA (3 1 2) +exim CALLER@mxdane512ee.test.ex +Testing +**** +exim -qf +**** +killdaemon +exim -DSERVER=server -DDETAILS=ee -DNOTDAEMON -qf +**** +# +# +exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D +**** +# TLSA (2 0 1) +exim CALLER@mxdane256ta.test.ex +Testing +**** +exim -qf +**** +killdaemon +exim -DSERVER=server -DDETAILS=ta -DNOTDAEMON -qf +**** diff --git a/test/scripts/5840-DANE-OpenSSL/REQUIRES b/test/scripts/5840-DANE-OpenSSL/REQUIRES new file mode 100644 index 000000000..59cb7dc91 --- /dev/null +++ b/test/scripts/5840-DANE-OpenSSL/REQUIRES @@ -0,0 +1,3 @@ +support Experimental_DANE +support OpenSSL +running IPv4 diff --git a/test/scripts/5850-DANE-OpenSSL/5850 b/test/scripts/5850-DANE-OpenSSL/5850 deleted file mode 100644 index 814b4b0e8..000000000 --- a/test/scripts/5850-DANE-OpenSSL/5850 +++ /dev/null @@ -1,30 +0,0 @@ -# DANE client: general -# -exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D -**** -# TLSA (3 1 1) -exim CALLER@dane256ee.test.ex -Testing -**** -# TLSA (3 1 2) -exim CALLER@mxdane512ee.test.ex -Testing -**** -exim -qf -**** -killdaemon -exim -DSERVER=server -DDETAILS=ee -DNOTDAEMON -qf -**** -# -# -exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D -**** -# TLSA (2 0 1) -exim CALLER@mxdane256ta.test.ex -Testing -**** -exim -qf -**** -killdaemon -exim -DSERVER=server -DDETAILS=ta -DNOTDAEMON -qf -**** diff --git a/test/scripts/5850-DANE-OpenSSL/REQUIRES b/test/scripts/5850-DANE-OpenSSL/REQUIRES deleted file mode 100644 index 59cb7dc91..000000000 --- a/test/scripts/5850-DANE-OpenSSL/REQUIRES +++ /dev/null @@ -1,3 +0,0 @@ -support Experimental_DANE -support OpenSSL -running IPv4 diff --git a/test/scripts/5890-DANE/5890 b/test/scripts/5890-DANE/5890 deleted file mode 100644 index fd7b6d6d3..000000000 --- a/test/scripts/5890-DANE/5890 +++ /dev/null @@ -1,12 +0,0 @@ -# Expansion test for DANE. -# -# Some systems seem to use 1-byte fields for the leading -# 3 fields in a TLSA record, others 2-bytes. -# We need the result to match the string in dnszones-src/db.test.ex - -exim -be - -dnslookup tpda: ${lookup dnsdb {tlsa=_1225._tcp.dane512ee.test.ex} \ - {$value}{none}} - -**** diff --git a/test/scripts/5890-DANE/REQUIRES b/test/scripts/5890-DANE/REQUIRES deleted file mode 100644 index 2314a3236..000000000 --- a/test/scripts/5890-DANE/REQUIRES +++ /dev/null @@ -1,2 +0,0 @@ -support Experimental_DANE -running IPv4 -- cgit v1.2.3