Gitweb:
https://git.exim.org/exim.git/commitdiff/c0187be12d11f99314a658b1db1263cfff6dec05
Commit: c0187be12d11f99314a658b1db1263cfff6dec05
Parent: aff5e0c480dd4ac2ccd15906c250c18c93ac7f12
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Sep 13 16:33:24 2024 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Fri Sep 13 16:54:41 2024 +0100
Testsuite: tidying
---
test/maint/cp_testcase | 2 +-
test/maint/mv_testcase | 2 +-
test/stdout/0177 | 37 ----
test/stdout/0184 | 202 ----------------------
test/stdout/0185 | 33 ----
test/stdout/0232 | 6 -
test/stdout/0233 | 16 --
test/stdout/0241 | 1 -
test/stdout/0297 | 8 -
test/stdout/0316 | 12 --
test/stdout/0372 | 38 ----
test/stdout/0378 | 29 ----
test/stdout/0406 | 71 --------
test/stdout/0454 | 23 ---
test/stdout/0510 | 24 ---
test/stdout/0616 | 31 ----
test/stdout/0617 | 31 ----
test/stdout/0903 | 7 -
test/stdout/3650 | 21 ---
test/stdout/4190 | 458 +++++++++++++++++++++++++++++++++++++++++++++++++
test/stdout/4193 | 80 +++++++++
test/stdout/5201 | 1 -
22 files changed, 540 insertions(+), 593 deletions(-)
diff --git a/test/maint/cp_testcase b/test/maint/cp_testcase
index e2d90f8a0..a97913357 100755
--- a/test/maint/cp_testcase
+++ b/test/maint/cp_testcase
@@ -18,7 +18,7 @@ set -x
cp scripts/*/$srcnum $dstdir/$dstnum
git add $dstdir/$dstnum
-for d in confs log rejectlog paniclog stdin stderr
+for d in confs log rejectlog paniclog stdout stderr
do
if [ -f "$d/$srcnum" ]
then
diff --git a/test/maint/mv_testcase b/test/maint/mv_testcase
index e7b0dc3fe..54000812e 100755
--- a/test/maint/mv_testcase
+++ b/test/maint/mv_testcase
@@ -17,7 +17,7 @@ fi
set -x
git mv scripts/*/$srcnum $dstdir/$dstnum
-for d in confs log rejectlog paniclog stdin stderr
+for d in confs log rejectlog paniclog stdout stderr
do
[ -f "$d/$srcnum" ] && git mv "$d/$srcnum" "$d/$dstnum"
done
diff --git a/test/stdout/0177 b/test/stdout/0177
deleted file mode 100644
index 26fd516c5..000000000
--- a/test/stdout/0177
+++ /dev/null
@@ -1,37 +0,0 @@
-TTT sss 10HmbA-000000005vi-0000 <CALLER@???> *** frozen ***
- userx@???
- +D >usery:userx@???
-
-TTT sss 10HmbG-000000005vi-0000 <CALLER@???> *** frozen ***
- userz@???
-
-
-******** SERVER ********
-Listening on port 1224 ...
-Connection request from [127.0.0.1]
-220 ESMTP
-EHLO the.local.host.name
-250-OK
-250 HELP
-MAIL FROM:<CALLER@???>
-250 Sender OK
-RCPT TO:<userx@???>
-250 Recipient OK
-DATA
-350 Send message
-Received: from CALLER by the.local.host.name with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbG-000000005vi-0000
- for userz@???;
- Tue, 2 Mar 1999 09:44:33 +0000
-Subject: freeze this (3)
-Message-Id: <E10HmbG-000000005vi-0000@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-This is a third message to be frozen.
-.
-250 OK
-QUIT
-250 OK
-End of script
diff --git a/test/stdout/0184 b/test/stdout/0184
deleted file mode 100644
index 7c70e0960..000000000
--- a/test/stdout/0184
+++ /dev/null
@@ -1,202 +0,0 @@
-To: contains
-000@???, 001@???, 002@???, 003@???, 004@???,
- 005@???, 006@???, 007@???, 008@???, 009@???,
- 010@???, 011@???, 012@???, 013@???, 014@???,
- 015@???, 016@???, 017@???, 018@???, 019@???,
- 020@???, 021@???, 022@???, 023@???, 024@???,
- 025@???, 026@???, 027@???, 028@???, 029@???,
- 030@???, 031@???, 032@???, 033@???, 034@???,
- 035@???, 036@???, 037@???, 038@???, 039@???,
- 040@???, 041@???, 042@???, 043@???, 044@???,
- 045@???, 046@???, 047@???, 048@???, 049@???,
- 050@???, 051@???, 052@???, 053@???, 054@???,
- 055@???, 056@???, 057@???, 058@???, 059@???,
- 060@???, 061@???, 062@???, 063@???, 064@???,
- 065@???, 066@???, 067@???, 068@???, 069@???,
- 070@???, 071@???, 072@???, 073@???, 074@???,
- 075@???, 076@???, 077@???, 078@???, 079@???,
- 080@???, 081@???, 082@???, 083@???, 084@???,
- 085@???, 086@???, 087@???, 088@???, 089@???,
- 090@???, 091@???, 092@???, 093@???, 094@???,
- 095@???, 096@???, 097@???, 098@???, 099@???,
- 100@???, 101@???, 102@???, 103@???, 104@???,
- 105@???, 106@???, 107@???, 108@???, 109@???,
- 110@???, 111@???, 112@???, 113@???, 114@???,
- 115@???, 116@???, 117@???, 118@???, 119@???,
- 120@???, 121@???, 122@???, 123@???, 124@???,
- 125@???, 126@???, 127@???, 128@???, 129@???,
- 130@???, 131@???, 132@???, 133@???, 134@???,
- 135@???, 136@???, 137@???, 138@???, 139@???,
- 140@???, 141@???, 142@???, 143@???, 144@???,
- 145@???, 146@???, 147@???, 148@???, 149@???,
- 150@???, 151@???, 152@???, 153@???, 154@???,
- 155@???, 156@???, 157@???, 158@???, 159@???,
- 160@???, 161@???, 162@???, 163@???, 164@???,
- 165@???, 166@???, 167@???, 168@???, 169@???,
- 170@???, 171@???, 172@???, 173@???, 174@???,
- 175@???, 176@???, 177@???, 178@???, 179@???,
- 180@???, 181@???, 182@???, 183@???, 184@???,
- 185@???, 186@???, 187@???, 188@???, 189@???,
- 190@???, 191@???, 192@???, 193@???, 194@???,
- 195@???, 196@???, 197@???, 198@???, 199@???,
- 200@???, 201@???, 202@???, 203@???, 204@???,
- 205@???, 206@???, 207@???, 208@???, 209@???,
- 210@???, 211@???, 212@???, 213@???, 214@???,
- 215@???, 216@???, 217@???, 218@???, 219@???,
- 220@???, 221@???, 222@???, 223@???, 224@???,
- 225@???, 226@???, 227@???, 228@???, 229@???,
- 230@???, 231@???, 232@???, 233@???, 234@???,
- 235@???, 236@???, 237@???, 238@???, 239@???,
- 240@???, 241@???, 242@???, 243@???, 244@???,
- 245@???, 246@???, 247@???, 248@???, 249@???,
- 250@???, 251@???, 252@???, 253@???, 254@???,
- 255@???, 256@???, 257@???, 258@???, 259@???,
- 260@???, 261@???, 262@???, 263@???, 264@???,
- 265@???, 266@???, 267@???, 268@???, 269@???,
- 270@???, 271@???, 272@???, 273@???, 274@???,
- 275@???, 276@???, 277@???, 278@???, 279@???,
- 280@???, 281@???, 282@???, 283@???, 284@???,
- 285@???, 286@???, 287@???, 288@???, 289@???,
- 290@???, 291@???, 292@???, 293@???, 294@???,
- 295@???, 296@???, 297@???, 298@???, 299@???,
- 300@???, 301@???, 302@???, 303@???, 304@???,
- 305@???, 306@???, 307@???, 308@???, 309@???,
- 310@???, 311@???, 312@???, 313@???, 314@???,
- 315@???, 316@???, 317@???, 318@???, 319@???,
- 320@???, 321@???, 322@???, 323@???, 324@???,
- 325@???, 326@???, 327@???, 328@???, 329@???,
- 330@???, 331@???, 332@???, 333@???, 334@???,
- 335@???, 336@???, 337@???, 338@???, 339@???,
- 340@???, 341@???, 342@???, 343@???, 344@???,
- 345@???, 346@???, 347@???, 348@???, 349@???,
- 350@???, 351@???, 352@???, 353@???, 354@???,
- 355@???, 356@???, 357@???, 358@???, 359@???,
- 360@???, 361@???, 362@???, 363@???, 364@???,
- 365@???, 366@???, 367@???, 368@???, 369@???,
- 370@???, 371@???, 372@???, 373@???, 374@???,
- 375@???, 376@???, 377@???, 378@???, 379@???,
- 380@???, 381@???, 382@???, 383@???, 384@???,
- 385@???, 386@???, 387@???, 388@???, 389@???,
- 390@???, 391@???, 392@???, 393@???, 394@???,
- 395@???, 396@???, 397@???, 398@???, 399@???,
- 400@???, 401@???, 402@???, 403@???, 404@???,
- 405@???, 406@???, 407@???, 408@???, 409@???,
- 410@???, 411@???, 412@???, 413@???, 414@???,
- 415@???, 416@???, 417@???, 418@???, 419@???,
- 420@???, 421@???, 422@???, 423@???, 424@???,
- 425@???, 426@???, 427@???, 428@???, 429@???,
- 430@???, 431@???, 432@???, 433@???, 434@???,
- 435@???, 436@???, 437@???, 438@???, 439@???,
- 440@???, 441@???, 442@???, 443@???, 444@???,
- 445@???, 446@???, 447@???, 448@???, 449@???,
- 450@???, 451@???, 452@???, 453@???, 454@???,
- 455@???, 456@???, 457@???, 458@???, 459@???,
- 460@???, 461@???, 462@???, 463@???, 464@???,
- 465@???, 466@???, 467@???, 468@???, 469@???,
- 470@???, 471@???, 472@???, 473@???, 474@???,
- 475@???, 476@???, 477@???, 478@???, 479@???,
- 480@???, 481@???, 482@???, 483@???, 484@???,
- 485@???, 486@???, 487@???, 488@???, 489@???,
- 490@???, 491@???, 492@???, 493@???, 494@???,
- 495@???, 496@???, 497@???, 498@???, 499@???,
- 500@???, 501@???, 502@???, 503@???, 504@???,
- 505@???, 506@???, 507@???, 508@???, 509@???,
- 510@???, 511@???, 512@???, 513@???, 514@???,
- 515@???, 516@???, 517@???, 518@???, 519@???,
- 520@???, 521@???, 522@???, 523@???, 524@???,
- 525@???, 526@???, 527@???, 528@???, 529@???,
- 530@???, 531@???, 532@???, 533@???, 534@???,
- 535@???, 536@???, 537@???, 538@???, 539@???,
- 540@???, 541@???, 542@???, 543@???, 544@???,
- 545@???, 546@???, 547@???, 548@???, 549@???,
- 550@???, 551@???, 552@???, 553@???, 554@???,
- 555@???, 556@???, 557@???, 558@???, 559@???,
- 560@???, 561@???, 562@???, 563@???, 564@???,
- 565@???, 566@???, 567@???, 568@???, 569@???,
- 570@???, 571@???, 572@???, 573@???, 574@???,
- 575@???, 576@???, 577@???, 578@???, 579@???,
- 580@???, 581@???, 582@???, 583@???, 584@???,
- 585@???, 586@???, 587@???, 588@???, 589@???,
- 590@???, 591@???, 592@???, 593@???, 594@???,
- 595@???, 596@???, 597@???, 598@???, 599@???,
- 600@???, 601@???, 602@???, 603@???, 604@???,
- 605@???, 606@???, 607@???, 608@???, 609@???,
- 610@???, 611@???, 612@???, 613@???, 614@???,
- 615@???, 616@???, 617@???, 618@???, 619@???,
- 620@???, 621@???, 622@???, 623@???, 624@???,
- 625@???, 626@???, 627@???, 628@???, 629@???,
- 630@???, 631@???, 632@???, 633@???, 634@???,
- 635@???, 636@???, 637@???, 638@???, 639@???,
- 640@???, 641@???, 642@???, 643@???, 644@???,
- 645@???, 646@???, 647@???, 648@???, 649@???,
- 650@???, 651@???, 652@???, 653@???, 654@???,
- 655@???, 656@???, 657@???, 658@???, 659@???,
- 660@???, 661@???, 662@???, 663@???, 664@???,
- 665@???, 666@???, 667@???, 668@???, 669@???,
- 670@???, 671@???, 672@???, 673@???, 674@???,
- 675@???, 676@???, 677@???, 678@???, 679@???,
- 680@???, 681@???, 682@???, 683@???, 684@???,
- 685@???, 686@???, 687@???, 688@???, 689@???,
- 690@???, 691@???, 692@???, 693@???, 694@???,
- 695@???, 696@???, 697@???, 698@???, 699@???,
- 700@???, 701@???, 702@???, 703@???, 704@???,
- 705@???, 706@???, 707@???, 708@???, 709@???,
- 710@???, 711@???, 712@???, 713@???, 714@???,
- 715@???, 716@???, 717@???, 718@???, 719@???,
- 720@???, 721@???, 722@???, 723@???, 724@???,
- 725@???, 726@???, 727@???, 728@???, 729@???,
- 730@???, 731@???, 732@???, 733@???, 734@???,
- 735@???, 736@???, 737@???, 738@???, 739@???,
- 740@???, 741@???, 742@???, 743@???, 744@???,
- 745@???, 746@???, 747@???, 748@???, 749@???,
- 750@???, 751@???, 752@???, 753@???, 754@???,
- 755@???, 756@???, 757@???, 758@???, 759@???,
- 760@???, 761@???, 762@???, 763@???, 764@???,
- 765@???, 766@???, 767@???, 768@???, 769@???,
- 770@???, 771@???, 772@???, 773@???, 774@???,
- 775@???, 776@???, 777@???, 778@???, 779@???,
- 780@???, 781@???, 782@???, 783@???, 784@???,
- 785@???, 786@???, 787@???, 788@???, 789@???,
- 790@???, 791@???, 792@???, 793@???, 794@???,
- 795@???, 796@???, 797@???, 798@???, 799@???,
- 800@???, 801@???, 802@???, 803@???, 804@???,
- 805@???, 806@???, 807@???, 808@???, 809@???,
- 810@???, 811@???, 812@???, 813@???, 814@???,
- 815@???, 816@???, 817@???, 818@???, 819@???,
- 820@???, 821@???, 822@???, 823@???, 824@???,
- 825@???, 826@???, 827@???, 828@???, 829@???,
- 830@???, 831@???, 832@???, 833@???, 834@???,
- 835@???, 836@???, 837@???, 838@???, 839@???,
- 840@???, 841@???, 842@???, 843@???, 844@???,
- 845@???, 846@???, 847@???, 848@???, 849@???,
- 850@???, 851@???, 852@???, 853@???, 854@???,
- 855@???, 856@???, 857@???, 858@???, 859@???,
- 860@???, 861@???, 862@???, 863@???, 864@???,
- 865@???, 866@???, 867@???, 868@???, 869@???,
- 870@???, 871@???, 872@???, 873@???, 874@???,
- 875@???, 876@???, 877@???, 878@???, 879@???,
- 880@???, 881@???, 882@???, 883@???, 884@???,
- 885@???, 886@???, 887@???, 888@???, 889@???,
- 890@???, 891@???, 892@???, 893@???, 894@???,
- 895@???, 896@???, 897@???, 898@???, 899@???,
- 900@???, 901@???, 902@???, 903@???, 904@???,
- 905@???, 906@???, 907@???, 908@???, 909@???,
- 910@???, 911@???, 912@???, 913@???, 914@???,
- 915@???, 916@???, 917@???, 918@???, 919@???,
- 920@???, 921@???, 922@???, 923@???, 924@???,
- 925@???, 926@???, 927@???, 928@???, 929@???,
- 930@???, 931@???, 932@???, 933@???, 934@???,
- 935@???, 936@???, 937@???, 938@???, 939@???,
- 940@???, 941@???, 942@???, 943@???, 944@???,
- 945@???, 946@???, 947@???, 948@???, 949@???,
- 950@???, 951@???, 952@???, 953@???, 954@???,
- 955@???, 956@???, 957@???, 958@???, 959@???,
- 960@???, 961@???, 962@???, 963@???, 964@???,
- 965@???, 966@???, 967@???, 968@???, 969@???,
- 970@???, 971@???, 972@???, 973@???, 974@???,
- 975@???, 976@???, 977@???, 978@???, 979@???,
- 980@???, 981@???, 982@???, 983@???, 984@???,
- 985@???, 986@???, 987@???, 988@???, 989@???,
- 990@???, 991@???, 992@???, 993@???, 994@???,
- 995@???, 996@???, 997@???, 998@???, 999@???
-nnnnnn
diff --git a/test/stdout/0185 b/test/stdout/0185
deleted file mode 100644
index 68425b415..000000000
--- a/test/stdout/0185
+++ /dev/null
@@ -1,33 +0,0 @@
-TTT sss 10HmaX-000000005vi-0000 <CALLER@???> *** frozen ***
- usery@???
-
-
-******** SERVER ********
-Listening on port 1224 ...
-Connection request from [127.0.0.1]
-220 ESMTP
-EHLO the.local.host.name
-250-OK
-250 HELP
-MAIL FROM:<CALLER@???>
-250 Sender OK
-RCPT TO:<userx@???>
-250 Recipient OK
-DATA
-350 Send message
-Received: from CALLER by the.local.host.name with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-000000005vi-0000
- for usery@???;
- Tue, 2 Mar 1999 09:44:33 +0000
-Subject: freeze this
-Message-Id: <E10HmaX-000000005vi-0000@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-This is a message to be frozen.
-.
-250 OK
-QUIT
-250 OK
-End of script
diff --git a/test/stdout/0232 b/test/stdout/0232
deleted file mode 100644
index 55a07933b..000000000
--- a/test/stdout/0232
+++ /dev/null
@@ -1,6 +0,0 @@
-prefix-filter1.test.ex@???
- <-- filter1.test.ex@???
- router = rest, transport = local_delivery
-postmaster@???
- <-- filter1.test.ex@???
- router = rest, transport = local_delivery
diff --git a/test/stdout/0233 b/test/stdout/0233
deleted file mode 100644
index 97fdce807..000000000
--- a/test/stdout/0233
+++ /dev/null
@@ -1,16 +0,0 @@
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 myhost.test.ex Hello CALLER at test
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-000000005vi-0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-000000005vi-0000
-250 OK
-250 Accepted
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-000000005vi-0000
-221 myhost.test.ex closing connection
diff --git a/test/stdout/0241 b/test/stdout/0241
deleted file mode 100644
index 4bd6a5344..000000000
--- a/test/stdout/0241
+++ /dev/null
@@ -1 +0,0 @@
-Message 10HmaX-000000005vi-0000 is no longer frozen
diff --git a/test/stdout/0297 b/test/stdout/0297
deleted file mode 100644
index d6947af8c..000000000
--- a/test/stdout/0297
+++ /dev/null
@@ -1,8 +0,0 @@
-/a/b/c@??? -> /a/b/c
- transport = tf1
-/x/y/z@??? -> /x/y/z
- transport = tf2
-/a/b/c/@??? -> /a/b/c/
- transport = td1
-/a/a/b//@??? -> /a/a/b//
- transport = td2
diff --git a/test/stdout/0316 b/test/stdout/0316
deleted file mode 100644
index e26b82a1f..000000000
--- a/test/stdout/0316
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: no message headers read
-Return-path copied from sender
-Sender = CALLER@???
-Recipient = CALLER@???
-Testing Exim filter file "TESTSUITE/aux-fixed/0316.f-user"
-
-Testprint: 1 Matched c@d
-Testprint: 2 Matched c@d
-Testprint: 3 Matched cc@dd
-Testprint: 4 Matched e@f
-Filtering did not set up a significant delivery.
-Normal delivery will occur.
diff --git a/test/stdout/0372 b/test/stdout/0372
deleted file mode 100644
index 76372708e..000000000
--- a/test/stdout/0372
+++ /dev/null
@@ -1,38 +0,0 @@
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 myhost.test.ex Hello CALLER at host.name [1.2.3.4]
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-000000005vi-0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-000000005vi-0000
-221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 myhost.test.ex Hello CALLER at host2.name [4.3.2.1]
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-000000005vi-0000
-221 myhost.test.ex closing connection
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> HELO test
-??? 250
-<<< 250 myhost.test.ex Hello localhost [127.0.0.1]
->>> MAIL FROM:<>
-??? 250
-<<< 250 OK
->>> RCPT TO:<x@y>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> .
-??? 250
-<<< 250 OK id=10HmbA-000000005vi-0000
->>> QUIT
-End of script
diff --git a/test/stdout/0378 b/test/stdout/0378
deleted file mode 100644
index 988556e1e..000000000
--- a/test/stdout/0378
+++ /dev/null
@@ -1,29 +0,0 @@
-10HmaX-000000005vi-0000-H
-CALLER UID GID
-<CALLER@???>
-ddddddddd 0
--received_time_usec .uuuuuu
--received_time_complete tttt.uuuuuu
--ident CALLER
--received_protocol local
--body_linecount 0
--max_received_linelength 0
--auth_id CALLER
--auth_sender CALLER@???
--allow_unqualified_recipient
--allow_unqualified_sender
--local
-YY >CALLER@???:aaaa@???
-NN TESTSUITE/test-mail/file:aaaa@???
-NN |/bin/sh -c exit:aaaa@???
-1
-aaaa@???
-
-dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-000000005vi-0000
- for aaaa@???;
- Tue, 2 Mar 1999 09:44:33 +0000
-054I Message-Id: <E10HmaX-000000005vi-0000@???>
-dddF From: CALLER_NAME <CALLER@???>
-038 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0406 b/test/stdout/0406
deleted file mode 100644
index 51ebd51cb..000000000
--- a/test/stdout/0406
+++ /dev/null
@@ -1,71 +0,0 @@
-Return-path copied from sender
-Sender = CALLER@???
-Recipient = CALLER@???
-Testing Exim filter file "TESTSUITE/aux-fixed/0406.f"
-
-Testprint: subject = >lots of leading and trailing space<
-Testprint: raw subject = > lots of leading and trailing space \n<
-Testprint: to = >a@b,\nc@d<
-Testprint: raw to = > a@b \n c@d \n<
-Testprint: rX-1: > (=?ISO-8859-1?Q?a?=)\n<
-Testprint: bX-1: >(a)<
-Testprint: X-1: >(a)<
-Testprint: rX-2: > (=?ISO-8859-1?Q?a?= b)\n<
-Testprint: bX-2: >(a b)<
-Testprint: X-2: >(a b)<
-Testprint: rX-3: > (=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)\n<
-Testprint: bX-3: >(ab)<
-Testprint: X-3: >(ab)<
-Testprint: rX-4: > (=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)\n<
-Testprint: bX-4: >(ab)<
-Testprint: X-4: >(ab)<
-Testprint: rX-5: > (=?ISO-8859-1?Q?a?= \n =?ISO-8859-1?Q?b?=)\n<
-Testprint: bX-5: >(ab)<
-Testprint: X-5: >(ab)<
-Testprint: rX-6: > (=?ISO-8859-1?Q?a_b?=)\n<
-Testprint: bX-6: >(a b)<
-Testprint: X-6: >(a b)<
-Testprint: rX-7: > (=?ISO-8859-1?Q?a?= =?ISO-8859-2?Q?_b?=)\n<
-Testprint: bX-7: >(a b)<
-Testprint: X-7: >(a b)<
-Testprint: rX-8: > (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)\n<
-Testprint: bX-8: >(\355\345\354\371 \357\341 \351\354\350\364\360)<
-Testprint: X-8: >(\355\345\354\371 \357\341 \351\354\350\364\360)<
-Testprint: rX-9: > =?ISO-8859-1?Q?Patrik_F=E4ltstr=F6m?= <xxx>\n<
-Testprint: bX-9: >Patrik F\344ltstr\366m <xxx><
-Testprint: X-9: >Patrik F\344ltstr\366m <xxx><
-Testprint: rX-10: > =?US-ASCII?Q?Keith_Moore?= <xxx>\n<
-Testprint: bX-10: >Keith Moore <xxx><
-Testprint: X-10: >Keith Moore <xxx><
-Testprint: rX-11: > =?ISO-8859-1?Q?Keld_J=F8rn_Simonsen?= <xxx>\n<
-Testprint: bX-11: >Keld J\370rn Simonsen <xxx><
-Testprint: X-11: >Keld J\370rn Simonsen <xxx><
-Testprint: rX-12: > =?ISO-8859-1?Q?Andr=E9?= Pirard <xxx>\n<
-Testprint: bX-12: >Andr\351 Pirard <xxx><
-Testprint: X-12: >Andr\351 Pirard <xxx><
-Testprint: rX-13: > =?ISO-8859-1?B?SWYgeW91IGNhbiByZWFkIHRoaXMgeW8=?=\n =?ISO-8859-2?B?dSB1bmRlcnN0YW5kIHRoZSBleGFtcGxlLg==?=\n<
-Testprint: bX-13: >If you can read this you understand the example.<
-Testprint: X-13: >If you can read this you understand the example.<
-Testprint: rX-14: > =?ISO-8859-1?Q?X=00Y?= \n<
-Testprint: bX-14: >X?Y<
-Testprint: X-14: >X?Y<
-Testprint: rX-15: > =?iso-8859-3?Q?=?= =?US-ASCII?Q?ABCD?= Text\n<
-Testprint: bX-15: >=?iso-8859-3?Q?=?= ABCD Text<
-Testprint: X-15: >=?iso-8859-3?Q?=?= ABCD Text<
-Testprint: rX-16: > =?iso-8859-3?B?+2?= =?UTF-8?Q?ABCD?= Text\n<
-Testprint: bX-16: >=?iso-8859-3?B?+2?= ABCD Text<
-Testprint: X-16: >=?iso-8859-3?B?+2?= ABCD Text<
-Testprint: rX-17: > =?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=\n<
-Testprint: bX-17: >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx<
-Testprint: X-17: >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx<
-Testprint: rX-18: > =?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=\n<
-Testprint: bX-18: >=?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=<
-Testprint: X-18: >=?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=<
-Testprint: rX-19: > =?iso-8859-3?B?=?= =?UTF-8?Q?ABCD?= Text\n<
-Testprint: bX-19: >=?iso-8859-3?B?=?= ABCD Text<
-Testprint: X-19: >=?iso-8859-3?B?=?= ABCD Text<
-Testprint: rX-20: > =?iso-8859-1?Q?a?= =?ISO-8859-1?Q?x y?= bad because of space\n<
-Testprint: bX-20: >a =?ISO-8859-1?Q?x y?= bad because of space<
-Testprint: X-20: >a =?ISO-8859-1?Q?x y?= bad because of space<
-Filtering did not set up a significant delivery.
-Normal delivery will occur.
diff --git a/test/stdout/0454 b/test/stdout/0454
deleted file mode 100644
index f1106d184..000000000
--- a/test/stdout/0454
+++ /dev/null
@@ -1,23 +0,0 @@
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> helo rhu.barb
-??? 250
-<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
->>> mail from:<userx@???>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@???>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 3
-<<< 354 Enter message, ending with "." on a line by itself
->>> This is a test message.
->>> .
-??? 250
-<<< 250 OK id=10HmaX-000000005vi-0000
->>> QUIT
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
diff --git a/test/stdout/0510 b/test/stdout/0510
deleted file mode 100644
index 72eebab51..000000000
--- a/test/stdout/0510
+++ /dev/null
@@ -1,24 +0,0 @@
-Return-path copied from sender
-Sender = sen@???
-Recipient = CALLER@???
-Testing Exim filter file "TESTSUITE/aux-fixed/0510.sfilter"
-
-Testprint: --------System filter---------
-Testprint: Sender: sen@???
-Testprint: Subject: test 1
-Testprint: Body: Body content.
-Headers add "X-Header: Added in a system filter"
-Add 3 to n1
-Testprint: n1: 3
-Filtering did not set up a significant delivery.
-Normal delivery will occur.
-Testing Exim filter file "TESTSUITE/aux-fixed/0510.ufilter"
-
-Testprint: --------User filter---------
-Testprint: Sender: sen@???
-Testprint: Subject: test 1
-Testprint: Body: Body content.
-Testprint: X-Header: Added in a system filter
-Testprint: sn1: 3
-Filtering did not set up a significant delivery.
-Normal delivery will occur.
diff --git a/test/stdout/0616 b/test/stdout/0616
deleted file mode 100644
index f18163d4f..000000000
--- a/test/stdout/0616
+++ /dev/null
@@ -1,31 +0,0 @@
-
-******** SERVER ********
-Listening on port 1224 ...
-Connection request from [127.0.0.1]
-220 ESMTP
-EHLO the.local.host.name
-250-OK
-250 HELP
-MAIL FROM:<dump@domain1>
-250 OK
-RCPT TO:<userx@domain1>
-250 OK
-RCPT TO:<usery@domain1>
-550 Not that one
-DATA
-354 More...
-Received: from CALLER by the.local.host.name with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-000000005vi-0000
- for userx@domain1;
- Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-000000005vi-0000@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-This message will also be delivered to usery
-.
-250 OK
-QUIT
-220 OK
-End of script
diff --git a/test/stdout/0617 b/test/stdout/0617
deleted file mode 100644
index f18163d4f..000000000
--- a/test/stdout/0617
+++ /dev/null
@@ -1,31 +0,0 @@
-
-******** SERVER ********
-Listening on port 1224 ...
-Connection request from [127.0.0.1]
-220 ESMTP
-EHLO the.local.host.name
-250-OK
-250 HELP
-MAIL FROM:<dump@domain1>
-250 OK
-RCPT TO:<userx@domain1>
-250 OK
-RCPT TO:<usery@domain1>
-550 Not that one
-DATA
-354 More...
-Received: from CALLER by the.local.host.name with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-000000005vi-0000
- for userx@domain1;
- Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-000000005vi-0000@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-This message will also be delivered to usery
-.
-250 OK
-QUIT
-220 OK
-End of script
diff --git a/test/stdout/0903 b/test/stdout/0903
deleted file mode 100644
index a7bda45dc..000000000
--- a/test/stdout/0903
+++ /dev/null
@@ -1,7 +0,0 @@
-# Exim Configuration (X)
-# 1 "TESTSUITE/test-config"
-# 1 "TESTSUITE/test-config"
-# 1 "TESTSUITE/confs/0903./aaa"
-# 1 "TESTSUITE/confs/0903./aaa"
-# 1 "TESTSUITE/confs/0903./aaa"
-# 1 "TESTSUITE/test-config"
diff --git a/test/stdout/3650 b/test/stdout/3650
deleted file mode 100644
index 87f70de47..000000000
--- a/test/stdout/3650
+++ /dev/null
@@ -1,21 +0,0 @@
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO xxxx
-??? 250-
-<<< 250-myhost.test.ex Hello xxxx [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250
-<<< 250 HELP
->>> AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-??? 535
-<<< 535 Incorrect authentication data
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
diff --git a/test/stdout/4190 b/test/stdout/4190
new file mode 100644
index 000000000..7e70360e3
--- /dev/null
+++ b/test/stdout/4190
@@ -0,0 +1,458 @@
+==========
+# Sieve filter
+if address ["From","To"] "marian@???"
+ { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if address :is "From" "marian@???"
+ { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if address :is "To" "marian@???"
+ { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if address :contains "To" "abcdefgh"
+ { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if address :matches "To" "*abc?efgh*"
+ { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if true { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if allof (false,false) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if allof (true,false) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if allof (false,true) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if allof (true,true) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if anyof (false,false) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if anyof (true,false) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if anyof (false,true) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if anyof (true,true) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not anyof (false,false) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not anyof (true,false) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if not anyof (false,true) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if not anyof (true,true) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header "to" "MARIAN@???" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :comparator "i;octet" "to" "MARIAN@???" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header :comparator "i;ascii-casemap" "to" "MARIAN@???" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+require "envelope";
+if envelope "from" "marian@???" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+require "envelope";
+if envelope "from" "offerqn@???" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if exists [ "X-NotHere", "X-Notheretoo" ] { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if exists [ "X-NotHere", "Delivered-To" ] { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if exists [ "From", "Delivered-To" ] { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :contains "X-NotHere" "" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header "Delivered-To" "" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header :contains "Delivered-To" "" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :contains "Delivered-To" "rc@???" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "Delivered-To" ["irc@???"] { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header "Delivered-To" ["irc@???","irc@???","some.one"] { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header "Mime-Version" "1.0" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if true { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if true { discard; } else { keep; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { keep; } else { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { keep; } elsif true { discard; } else { keep; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if true { discard; } elsif true { keep; } else { keep; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { keep; }
+ else
+ { if true { discard; } else { keep; } }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "to" "MA*AN@abc*fg?.example" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "to" "MA?AN@abc*fg?.example" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "to" "*marian@???" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "to" "?marian@???" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "to" "marian@???*" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "to" "marian@????" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "x-special1" "\\?*\\*" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "x-special1" "*\0*" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if not header :matches "x-special1" "*\0*q" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+require "encoded-character";
+if not header :matches "x-special1" "*${hex:00}*" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if not header :matches "x-special2" "\\?*\\*" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "x-special2" "*\0*" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if size :over 400 {
+ discard;
+ }
+==========
+No implicit keep
+==========
+# Sieve filter
+if size :over 4K {
+ discard;
+ }
+==========
+Implicit keep
+==========
+# Sieve filter
+if size :under 4K { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if size :under 400 { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if false { keep; }
+==========
+Implicit keep
+==========
+# no filter line here
+if unknowntest { keep; }
+==========
+Testing forward file file "test-data"
+
+exim: error in forward file: missing or malformed local part (expected word or "<") in "if unknowntest { keep; }"
+==========
+# Sieve filter
+if test keep; }
+==========
+Sieve error: missing test in line 2
+==========
+# Sieve filter
+if test { keep;
+==========
+Sieve error: missing test in line 2
+==========
+# Sieve filter
+if true { unknownaction; }
+==========
+Sieve error: expecting command or closing brace in line 2
+==========
+# Sieve filter
+if true { fileinto abcdefgh; }
+==========
+Sieve error: missing previous require "fileinto"; in line 2
+==========
+# Sieve filter
+require "fileinto";
+if true { fileinto "abcdefgh"; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header ["to"] [ "marian@???", "achnee"] { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "to" [ "egal", "achnee" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if header "to","from"] "egal" { keep; }
+==========
+Sieve error: key string list expected in line 2
+==========
+# Sieve filter
+if header ["to","from" "egal" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if header ["to",,"from"] "egal" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if header ["to",] "egal" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if header [,"to"] "egal" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if unknowntest { keep; }
+==========
+Sieve error: missing test in line 2
+==========
+# Sieve filter
+if header :matches "to" "egal" { keep; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header :unknown "to" "egal" { keep; }
+==========
+Sieve error: header string list expected in line 2
+==========
+# Sieve filter
+#
+require ["fileinto", "envelope"];
+
+if header :matches "X-Warning" "* is listed at list.dsbl.org*"
+ {
+ keep; # keep in "In" folder
+ }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-1" "1" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header "x-1" "=?ISO-8859-1?Q?=31?=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-1b" "=?ISO-8859-1?Q?=31=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-b64" "This is BASE64" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-b64-broken" "=?iso-8859-1?b?VGhpcyBpcyBCQVNFNjQ?=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-q75total" "0123456789012345678901234567890123456789012345678901234567" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-q76total" "=?ISO-8859-1?Q?01234567890123456789012345678901234567890123456789012345678?=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "X-Wrapped" "eins zwei drei" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-nomimewrap" "=?iso-8859-1?q?abc def ghi?=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "subject" "abcdefghi" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-mixed" "abc def" { discard; }
+==========
+No implicit keep
+==========
+#Sieve filter
+if true { stop; fileinto "inbox.never"; }
+==========
+Implicit keep
diff --git a/test/stdout/4193 b/test/stdout/4193
new file mode 100644
index 000000000..8a9ae2366
--- /dev/null
+++ b/test/stdout/4193
@@ -0,0 +1,80 @@
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> HELO tester
+??? 250
+<<< 250 myhost.test.ex Hello tester [127.0.0.1]
+>>> MAIL FROM:<implcit@???>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<CALLER@???>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> From: <good@???>
+>>> Subject: this should be accepted and filed
+>>>
+>>> a single body line
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-000000005vi-0000
+>>> RSET
+??? 250
+<<< 250 Reset OK
++++ 1
+>>> MAIL FROM:<discard@???>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<CALLER@???>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> From: <coyote@???>
+>>> Subject: this should be discarded by the filter
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-000000005vi-0000
+>>> RSET
+??? 250
+<<< 250 Reset OK
++++ 1
+>>> MAIL FROM:<identified@???>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<CALLER@???>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> From: <spot_this@???>
+>>> Subject: this should be delivered to a speicifc place by the filter
+>>> .
+??? 250
+<<< 250 OK id=10HmaZ-000000005vi-0000
+>>> RSET
+??? 250
+<<< 250 Reset OK
++++ 1
+>>> MAIL FROM:<redirect@???>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<CALLER@???>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> From: <redirect@???>
+>>> Subject: this should be redirected by the filter to a different address
+>>> .
+??? 250
+<<< 250 OK id=10HmbA-000000005vi-0000
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/5201 b/test/stdout/5201
deleted file mode 100644
index 0e3e5a0ac..000000000
--- a/test/stdout/5201
+++ /dev/null
@@ -1 +0,0 @@
-Message 10HmaX-000000005vi-0000 is now frozen
--
## subscription configuration (requires account):
##
https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at
http://www.exim.org/
## Please use the Wiki with this list -
http://wiki.exim.org/
