summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2021-08-10 15:24:48 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2021-08-11 11:40:37 +0100
commitaffed2ac590a1aa3a82afee1216a869ed92537c3 (patch)
tree876d19c7d96a7447e217a3e0c9eec778c1112a73
parentc819f3bcad02bcb06004ae2ad135b68fab0ae888 (diff)
downloadexim4-affed2ac590a1aa3a82afee1216a869ed92537c3.tar.gz
Testsuite: testcase shuffling
(cherry picked from commit 5078e5337323159ff8c293e7ae335a974fd0371e)
-rw-r--r--test/aux-fixed/4515.mlistfooter (renamed from test/aux-fixed/4525.mlistfooter)0
-rw-r--r--test/confs/4510 (renamed from test/confs/4520)2
l---------test/confs/4511 (renamed from test/confs/4521)0
l---------test/confs/4512 (renamed from test/confs/4522)0
l---------test/confs/45131
l---------test/confs/45141
-rw-r--r--test/confs/4515 (renamed from test/confs/4525)2
l---------test/confs/4519 (renamed from test/confs/4530)0
l---------test/confs/45231
l---------test/confs/45241
l---------test/confs/45412
l---------test/confs/45452
-rw-r--r--test/log/4510 (renamed from test/log/4520)0
-rw-r--r--test/log/4511 (renamed from test/log/4521)0
-rw-r--r--test/log/4512 (renamed from test/log/4522)0
-rw-r--r--test/log/4513 (renamed from test/log/4523)0
-rw-r--r--test/log/4514 (renamed from test/log/4524)0
-rw-r--r--test/log/4515 (renamed from test/log/4525)0
-rw-r--r--test/log/4519 (renamed from test/log/4530)0
-rw-r--r--test/mail/4510.a (renamed from test/mail/4520.a)0
-rw-r--r--test/mail/4510.b (renamed from test/mail/4520.b)0
-rw-r--r--test/mail/4510.b10 (renamed from test/mail/4520.b10)0
-rw-r--r--test/mail/4510.b12 (renamed from test/mail/4520.b12)0
-rw-r--r--test/mail/4510.b20 (renamed from test/mail/4520.b20)0
-rw-r--r--test/mail/4510.b22 (renamed from test/mail/4520.b22)0
-rw-r--r--test/mail/4510.d (renamed from test/mail/4520.d)0
-rw-r--r--test/mail/4510.e (renamed from test/mail/4520.e)0
-rw-r--r--test/mail/4510.f (renamed from test/mail/4520.f)0
-rw-r--r--test/mail/4513.a (renamed from test/mail/4523.a)0
-rw-r--r--test/mail/4514.c (renamed from test/mail/4524.c)0
-rw-r--r--test/mail/4515.a (renamed from test/mail/4525.a)0
-rw-r--r--test/mail/4515.b (renamed from test/mail/4525.b)0
-rw-r--r--test/mail/4515.c (renamed from test/mail/4525.c)0
-rw-r--r--test/mail/4519.y (renamed from test/mail/4530.y)0
-rw-r--r--test/mail/4519.z (renamed from test/mail/4530.z)0
-rw-r--r--test/paniclog/4510 (renamed from test/paniclog/4520)0
-rw-r--r--test/scripts/4500-DKIM/4510 (renamed from test/scripts/4500-DKIM/4520)0
-rw-r--r--test/scripts/4500-DKIM/4511 (renamed from test/scripts/4500-DKIM/4521)0
-rw-r--r--test/scripts/4500-DKIM/4512 (renamed from test/scripts/4500-DKIM/4522)0
-rw-r--r--test/scripts/4500-DKIM/4513 (renamed from test/scripts/4500-DKIM/4523)0
-rw-r--r--test/scripts/4500-DKIM/4514 (renamed from test/scripts/4500-DKIM/4524)0
-rw-r--r--test/scripts/4500-DKIM/4515 (renamed from test/scripts/4500-DKIM/4525)0
-rw-r--r--test/scripts/4500-DKIM/4519 (renamed from test/scripts/4500-DKIM/4530)0
-rw-r--r--test/stderr/4510 (renamed from test/stderr/4520)0
-rw-r--r--test/stderr/4511 (renamed from test/stderr/4521)0
-rw-r--r--test/stderr/4512 (renamed from test/stderr/4522)0
-rw-r--r--test/stdout/451297
-rw-r--r--test/stdout/451975
48 files changed, 178 insertions, 6 deletions
diff --git a/test/aux-fixed/4525.mlistfooter b/test/aux-fixed/4515.mlistfooter
index 7c33b8233..7c33b8233 100644
--- a/test/aux-fixed/4525.mlistfooter
+++ b/test/aux-fixed/4515.mlistfooter
diff --git a/test/confs/4520 b/test/confs/4510
index d2f2f7022..6f27340e6 100644
--- a/test/confs/4520
+++ b/test/confs/4510
@@ -1,4 +1,4 @@
-# Exim test configuration 4520
+# Exim test configuration 4510
SERVER=
OPT=
diff --git a/test/confs/4521 b/test/confs/4511
index 1bb987150..1bb987150 120000
--- a/test/confs/4521
+++ b/test/confs/4511
diff --git a/test/confs/4522 b/test/confs/4512
index 1bb987150..1bb987150 120000
--- a/test/confs/4522
+++ b/test/confs/4512
diff --git a/test/confs/4513 b/test/confs/4513
new file mode 120000
index 000000000..a06e235b0
--- /dev/null
+++ b/test/confs/4513
@@ -0,0 +1 @@
+4510 \ No newline at end of file
diff --git a/test/confs/4514 b/test/confs/4514
new file mode 120000
index 000000000..a06e235b0
--- /dev/null
+++ b/test/confs/4514
@@ -0,0 +1 @@
+4510 \ No newline at end of file
diff --git a/test/confs/4525 b/test/confs/4515
index a5b7f2cd0..425f507c1 100644
--- a/test/confs/4525
+++ b/test/confs/4515
@@ -1,4 +1,4 @@
-# Exim test configuration 4525
+# Exim test configuration 4515
SERVER=
OPT=
diff --git a/test/confs/4530 b/test/confs/4519
index a8ce02c97..a8ce02c97 120000
--- a/test/confs/4530
+++ b/test/confs/4519
diff --git a/test/confs/4523 b/test/confs/4523
deleted file mode 120000
index 072f5faf2..000000000
--- a/test/confs/4523
+++ /dev/null
@@ -1 +0,0 @@
-4520 \ No newline at end of file
diff --git a/test/confs/4524 b/test/confs/4524
deleted file mode 120000
index 072f5faf2..000000000
--- a/test/confs/4524
+++ /dev/null
@@ -1 +0,0 @@
-4520 \ No newline at end of file
diff --git a/test/confs/4541 b/test/confs/4541
index 072f5faf2..a06e235b0 120000
--- a/test/confs/4541
+++ b/test/confs/4541
@@ -1 +1 @@
-4520 \ No newline at end of file
+4510 \ No newline at end of file
diff --git a/test/confs/4545 b/test/confs/4545
index 072f5faf2..a06e235b0 120000
--- a/test/confs/4545
+++ b/test/confs/4545
@@ -1 +1 @@
-4520 \ No newline at end of file
+4510 \ No newline at end of file
diff --git a/test/log/4520 b/test/log/4510
index d1797e68c..d1797e68c 100644
--- a/test/log/4520
+++ b/test/log/4510
diff --git a/test/log/4521 b/test/log/4511
index 61c5bdbd1..61c5bdbd1 100644
--- a/test/log/4521
+++ b/test/log/4511
diff --git a/test/log/4522 b/test/log/4512
index 25a874941..25a874941 100644
--- a/test/log/4522
+++ b/test/log/4512
diff --git a/test/log/4523 b/test/log/4513
index cd1ba4fb9..cd1ba4fb9 100644
--- a/test/log/4523
+++ b/test/log/4513
diff --git a/test/log/4524 b/test/log/4514
index 398c4b8e1..398c4b8e1 100644
--- a/test/log/4524
+++ b/test/log/4514
diff --git a/test/log/4525 b/test/log/4515
index f4b7496d5..f4b7496d5 100644
--- a/test/log/4525
+++ b/test/log/4515
diff --git a/test/log/4530 b/test/log/4519
index b489d9c1d..b489d9c1d 100644
--- a/test/log/4530
+++ b/test/log/4519
diff --git a/test/mail/4520.a b/test/mail/4510.a
index 94fd9a45f..94fd9a45f 100644
--- a/test/mail/4520.a
+++ b/test/mail/4510.a
diff --git a/test/mail/4520.b b/test/mail/4510.b
index b80dc7185..b80dc7185 100644
--- a/test/mail/4520.b
+++ b/test/mail/4510.b
diff --git a/test/mail/4520.b10 b/test/mail/4510.b10
index de3c9cd5c..de3c9cd5c 100644
--- a/test/mail/4520.b10
+++ b/test/mail/4510.b10
diff --git a/test/mail/4520.b12 b/test/mail/4510.b12
index 392cee332..392cee332 100644
--- a/test/mail/4520.b12
+++ b/test/mail/4510.b12
diff --git a/test/mail/4520.b20 b/test/mail/4510.b20
index cc84e7840..cc84e7840 100644
--- a/test/mail/4520.b20
+++ b/test/mail/4510.b20
diff --git a/test/mail/4520.b22 b/test/mail/4510.b22
index 2b1e433e0..2b1e433e0 100644
--- a/test/mail/4520.b22
+++ b/test/mail/4510.b22
diff --git a/test/mail/4520.d b/test/mail/4510.d
index df5ea5099..df5ea5099 100644
--- a/test/mail/4520.d
+++ b/test/mail/4510.d
diff --git a/test/mail/4520.e b/test/mail/4510.e
index 5cc5bb8f4..5cc5bb8f4 100644
--- a/test/mail/4520.e
+++ b/test/mail/4510.e
diff --git a/test/mail/4520.f b/test/mail/4510.f
index 4e6d96d08..4e6d96d08 100644
--- a/test/mail/4520.f
+++ b/test/mail/4510.f
diff --git a/test/mail/4523.a b/test/mail/4513.a
index bfe40459b..bfe40459b 100644
--- a/test/mail/4523.a
+++ b/test/mail/4513.a
diff --git a/test/mail/4524.c b/test/mail/4514.c
index 92d09afb7..92d09afb7 100644
--- a/test/mail/4524.c
+++ b/test/mail/4514.c
diff --git a/test/mail/4525.a b/test/mail/4515.a
index 2f78aec6e..2f78aec6e 100644
--- a/test/mail/4525.a
+++ b/test/mail/4515.a
diff --git a/test/mail/4525.b b/test/mail/4515.b
index 6cd2538e0..6cd2538e0 100644
--- a/test/mail/4525.b
+++ b/test/mail/4515.b
diff --git a/test/mail/4525.c b/test/mail/4515.c
index 1032c0d83..1032c0d83 100644
--- a/test/mail/4525.c
+++ b/test/mail/4515.c
diff --git a/test/mail/4530.y b/test/mail/4519.y
index 35543799b..35543799b 100644
--- a/test/mail/4530.y
+++ b/test/mail/4519.y
diff --git a/test/mail/4530.z b/test/mail/4519.z
index f81ae7b01..f81ae7b01 100644
--- a/test/mail/4530.z
+++ b/test/mail/4519.z
diff --git a/test/paniclog/4520 b/test/paniclog/4510
index ef060aaa0..ef060aaa0 100644
--- a/test/paniclog/4520
+++ b/test/paniclog/4510
diff --git a/test/scripts/4500-DKIM/4520 b/test/scripts/4500-DKIM/4510
index f073be9d3..f073be9d3 100644
--- a/test/scripts/4500-DKIM/4520
+++ b/test/scripts/4500-DKIM/4510
diff --git a/test/scripts/4500-DKIM/4521 b/test/scripts/4500-DKIM/4511
index 3a78b020d..3a78b020d 100644
--- a/test/scripts/4500-DKIM/4521
+++ b/test/scripts/4500-DKIM/4511
diff --git a/test/scripts/4500-DKIM/4522 b/test/scripts/4500-DKIM/4512
index e8924b84e..e8924b84e 100644
--- a/test/scripts/4500-DKIM/4522
+++ b/test/scripts/4500-DKIM/4512
diff --git a/test/scripts/4500-DKIM/4523 b/test/scripts/4500-DKIM/4513
index 246d0d06b..246d0d06b 100644
--- a/test/scripts/4500-DKIM/4523
+++ b/test/scripts/4500-DKIM/4513
diff --git a/test/scripts/4500-DKIM/4524 b/test/scripts/4500-DKIM/4514
index 4076f10d5..4076f10d5 100644
--- a/test/scripts/4500-DKIM/4524
+++ b/test/scripts/4500-DKIM/4514
diff --git a/test/scripts/4500-DKIM/4525 b/test/scripts/4500-DKIM/4515
index dced4ae46..dced4ae46 100644
--- a/test/scripts/4500-DKIM/4525
+++ b/test/scripts/4500-DKIM/4515
diff --git a/test/scripts/4500-DKIM/4530 b/test/scripts/4500-DKIM/4519
index fb98e5564..fb98e5564 100644
--- a/test/scripts/4500-DKIM/4530
+++ b/test/scripts/4500-DKIM/4519
diff --git a/test/stderr/4520 b/test/stderr/4510
index 6087e66e6..6087e66e6 100644
--- a/test/stderr/4520
+++ b/test/stderr/4510
diff --git a/test/stderr/4521 b/test/stderr/4511
index 045fadc9b..045fadc9b 100644
--- a/test/stderr/4521
+++ b/test/stderr/4511
diff --git a/test/stderr/4522 b/test/stderr/4512
index 49a0fd875..49a0fd875 100644
--- a/test/stderr/4522
+++ b/test/stderr/4512
diff --git a/test/stdout/4512 b/test/stdout/4512
new file mode 100644
index 000000000..0067c9ff0
--- /dev/null
+++ b/test/stdout/4512
@@ -0,0 +1,97 @@
+### sha256, 1024b + message in 1 chunk
+Connecting to 127.0.0.1 port 1224 ... connected
+??? 220
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO xxx
+??? 250-
+<<< 250-testhost.test.ex Hello xxx [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-CHUNKING
+??? 250
+<<< 250 HELP
+>>> MAIL FROM:<CALLER@bloggs.com>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<a@test.ex>
+??? 250
+<<< 250 Accepted
+>>> BDAT 557 LAST
+>>> DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to
+>>> :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC
+>>> +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU
+>>> L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD
+>>> owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ=
+>>> From: mrgus@text.ex
+>>> To: bakawolf@yahoo.com
+>>> Date: Tue, 2 Mar 1999 09:44:33 +0000
+>>> Message-ID: <qwerty1234@disco-zombie.net>
+>>> Subject: simple test
+>>>
+>>> Line 1: This is a simple test.
+>>> Line 2: This is a simple test.
+??? 250- 557
+<<< 250- 557 byte chunk, total 557
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> QUIT
+??? 221
+<<< 221 testhost.test.ex closing connection
+End of script
+### sha256, 1024b + message in 2 chunks
+Connecting to 127.0.0.1 port 1224 ... connected
+??? 220
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO xxx
+??? 250-
+<<< 250-testhost.test.ex Hello xxx [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-CHUNKING
+??? 250
+<<< 250 HELP
+>>> MAIL FROM:<CALLER@bloggs.com>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<a@test.ex>
+??? 250
+<<< 250 Accepted
+>>> BDAT 525
+>>> DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to
+>>> :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC
+>>> +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU
+>>> L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD
+>>> owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ=
+>>> From: mrgus@text.ex
+>>> To: bakawolf@yahoo.com
+>>> Date: Tue, 2 Mar 1999 09:44:33 +0000
+>>> Message-ID: <qwerty1234@disco-zombie.net>
+>>> Subject: simple test
+>>>
+>>> Line 1: This is a simple test.
+??? 250 525
+<<< 250 525 byte chunk received
+>>> BDAT 32 LAST
+>>> Line 2: This is a simple test.
+??? 250- 32
+<<< 250- 32 byte chunk, total 557
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> QUIT
+??? 221
+<<< 221 testhost.test.ex closing connection
+End of script
+
+******** SERVER ********
+### sha256, 1024b + message in 1 chunk
+### sha256, 1024b + message in 2 chunks
diff --git a/test/stdout/4519 b/test/stdout/4519
new file mode 100644
index 000000000..9d64ae5f5
--- /dev/null
+++ b/test/stdout/4519
@@ -0,0 +1,75 @@
+Connecting to 127.0.0.1 port 1224 ... connected
+??? 220
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO xxx
+??? 250-
+<<< 250-testhost.test.ex Hello xxx [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-CHUNKING
+??? 250
+<<< 250 HELP
+>>> MAIL FROM:<CALLER@bloggs.com>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<z@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Subject: simple test
+>>>
+>>> Line 1: This is a simple test.
+>>> Line 2: This is a simple test.
+>>> ..Line 3 has a leading dot
+>>> last line: 4
+>>> .
+??? 250
+<<< 250 OK id=10HmaZ-0005vi-00
+>>> QUIT
+??? 221
+<<< 221 testhost.test.ex closing connection
+End of script
+Connecting to 127.0.0.1 port 1224 ... connected
+??? 220
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO xxx
+??? 250-
+<<< 250-testhost.test.ex Hello xxx [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-CHUNKING
+??? 250
+<<< 250 HELP
+>>> MAIL FROM:<CALLER@bloggs.com>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<y@test.ex>
+??? 250
+<<< 250 Accepted
+>>> BDAT 129 LAST
+>>> Subject: simple test
+>>>
+>>> Line 1: This is a simple test.
+>>> Line 2: This is a simple test.
+>>> .Line 3 has a leading dot
+>>> last line: 4
+??? 250-
+<<< 250- 129 byte chunk, total 129
+??? 250
+<<< 250 OK id=10HmbA-0005vi-00
+>>> QUIT
+??? 221
+<<< 221 testhost.test.ex closing connection
+End of script