Teststuite: munges needed for buildfarm

Broken by: 90bd3832bc0f

diff --git a/test/runtest b/test/runtest
index 45d00f9f8387e9746dc29d51eabfa26a72e2d463..cdf7bd339211523dc4c84c6454614206151b9c98 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1064,6 +1064,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # LIMITS is not always supported by the build
     next if /^limits_advertise_hosts =/;
 
+    # PRDR
+    next if /^hosts_try_prdr = *$/;
+
     # TLS resumption is not always supported by the build
     next if /^tls_resumption_hosts =/;
     next if /^-tls_resumption/;
@@ -1380,6 +1383,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # so convert them all to "0"
     s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
 
+    # CONTENT_SCAN
+    next if /try option acl_not_smtp_mime$/;
+
     # DISABLE_OCSP
     next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
 
@@ -1447,6 +1453,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # Not all platforms build with SPF enabled
     next if /^(spf_conn_init|SPF_dns_exim_new|spf_compile\.c)/;
+    next if /try option spf_smtp_comment_template$/;
 
     # Not all platforms have sendfile support
     next if /^cannot use sendfile for body: no support$/;
@@ -4893,4 +4900,5 @@ Start Exim wrapped by I<valgrind>. (default: don't use valgrind)
 =cut
 
 
+# vi: aw ai sw=2
 # End of runtest script

diff --git a/test/stderr/0092 b/test/stderr/0092
index 9df1800b513c905c5a7ad9d8298ec61b5252a24d..96616f098c47eb36a015e728fd443d1ba2dd0dc7 100644 (file)
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -127,7 +127,6 @@ test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.0.0.1]
 sender_rcvhost = [V4NET.0.0.1] (helo=test)
 set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.1]
-try option spf_smtp_comment_template
 try option acl_smtp_helo
 SMTP>> 250 myhost.test.ex Hello test [V4NET.0.0.1]
 SMTP<< mail from:userx@test.ex

diff --git a/test/stderr/0402 b/test/stderr/0402
index 57c4d48ac5a6fe74147f4920ed1d12fd50558658..07863fac72129bcfde116b54460809aca31016de 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -389,7 +389,6 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
-try option acl_not_smtp_mime
 try option acl_not_smtp
  ╭considering: ${tod_full}
  ├──expanding: ${tod_full}

diff --git a/test/stderr/0544 b/test/stderr/0544
index 2cbbb848d224d278f78480d74f98ea7b6f35decb..4763a38a432b192c1dd78d20774598ab9aab74ea 100644 (file)
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -346,7 +346,6 @@ try option received_header_text
  ╰─────result: Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-000000005vi-0000
-try option acl_not_smtp_mime
 try option acl_not_smtp
  ╭considering: ${tod_full}
  ├──expanding: ${tod_full}
@@ -465,7 +464,6 @@ try option smtp_banner
  ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-try option spf_smtp_comment_template
 try option acl_smtp_helo
  ╭considering: ${if match_domain {$sender_helo_name}{+dlist}}
   ╭considering: $sender_helo_name}{+dlist}}

diff --git a/test/stderr/0620 b/test/stderr/0620
index 852014746b996521539f66f61a8aeca85055612f..d2e76db191f77169c83b1157b6c0c87c6e9957d2 100644 (file)
--- a/test/stderr/0620
+++ b/test/stderr/0620
@@ -25,7 +25,6 @@ try option smtp_banner
  ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: primaryhostname.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-try option spf_smtp_comment_template
 try option acl_smtp_helo
 try option acl_smtp_mail
 try option acl_smtp_rcpt
@@ -100,7 +99,6 @@ try option smtp_banner
  ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: primaryhostname.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-try option spf_smtp_comment_template
 try option acl_smtp_helo
 try option acl_smtp_mail
 try option acl_smtp_rcpt

diff --git a/test/stderr/0632 b/test/stderr/0632
index 85f1979a7e7ed753bcd343152e220997fe312a1d..25b675dab948a16555d1279b64f05689afed0ef6 100644 (file)
--- a/test/stderr/0632
+++ b/test/stderr/0632
@@ -26,7 +26,6 @@ listening on all interfaces (IPv4) port PORT_D
 pid written to TESTSUITE/spool/exim-daemon.pid
 LOG: MAIN
   exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-try option spf_smtp_comment_template
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 Connection request from 127.0.0.1 port sssss

diff --git a/test/stderr/5410 b/test/stderr/5410
index 5d94a6b18868942de5bc89327d53415855c91679..63a5bb0965ce386a252201ba9846dd589648f11e 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -26,10 +26,9 @@ try option smtp_banner
  ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+try option acl_smtp_helo
  list element: *
   in limits_advertise_hosts? yes (matched "*")
-try option spf_smtp_comment_template
-try option acl_smtp_helo
  in dsn_advertise_hosts? no (option unset)
 try option acl_smtp_etrn
 try option acl_smtp_vrfy
@@ -82,6 +81,9 @@ domain.com in "! +local_domains"?
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
 domain.com in "! +local_domains"? yes (end of list)
+try option router_home_directory
+try option set
+processing address_data
  ╭considering: $local_part
  ├──────value: userx
             ╰──(tainted)
@@ -91,6 +93,8 @@ domain.com in "! +local_domains"? yes (end of list)
 domain.com in "*"?
  list element: *
  domain.com in "*"? yes (matched "*")
+try option transport
+try option unseen
 try option unseen
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
@@ -105,6 +109,9 @@ domain.com in "! +local_domains"?
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
 domain.com in "! +local_domains"? yes (end of list)
+try option router_home_directory
+try option set
+processing address_data
  ╭considering: $local_part
  ├──────value: userx
             ╰──(tainted)
@@ -114,6 +121,8 @@ domain.com in "! +local_domains"? yes (end of list)
 domain.com in "*"?
  list element: *
  domain.com in "*"? yes (matched "*")
+try option transport
+try option unseen
 try option unseen
 try option interface
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp
@@ -678,10 +687,9 @@ try option smtp_banner
  ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+try option acl_smtp_helo
  list element: *
   in limits_advertise_hosts? yes (matched "*")
-try option spf_smtp_comment_template
-try option acl_smtp_helo
  in dsn_advertise_hosts? no (option unset)
 try option acl_smtp_etrn
 try option acl_smtp_vrfy
@@ -734,6 +742,9 @@ domain.com in "! +local_domains"?
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
 domain.com in "! +local_domains"? yes (end of list)
+try option router_home_directory
+try option set
+processing address_data
  ╭considering: $local_part
  ├──────value: usery
             ╰──(tainted)
@@ -743,6 +754,8 @@ domain.com in "! +local_domains"? yes (end of list)
 domain.com in "*"?
  list element: *
  domain.com in "*"? yes (matched "*")
+try option transport
+try option unseen
 try option unseen
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
@@ -757,6 +770,9 @@ domain.com in "! +local_domains"?
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
 domain.com in "! +local_domains"? yes (end of list)
+try option router_home_directory
+try option set
+processing address_data
  ╭considering: $local_part
  ├──────value: usery
             ╰──(tainted)
@@ -766,6 +782,8 @@ domain.com in "! +local_domains"? yes (end of list)
 domain.com in "*"?
  list element: *
  domain.com in "*"? yes (matched "*")
+try option transport
+try option unseen
 try option unseen
 try option interface
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp
@@ -1280,10 +1298,9 @@ try option smtp_banner
  ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+try option acl_smtp_helo
  list element: *
   in limits_advertise_hosts? yes (matched "*")
-try option spf_smtp_comment_template
-try option acl_smtp_helo
  in dsn_advertise_hosts? no (option unset)
 try option acl_smtp_etrn
 try option acl_smtp_vrfy
@@ -1336,6 +1353,9 @@ domain.com in "! +local_domains"?
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
 domain.com in "! +local_domains"? yes (end of list)
+try option router_home_directory
+try option set
+processing address_data
  ╭considering: $local_part
  ├──────value: usery
             ╰──(tainted)
@@ -1345,6 +1365,8 @@ domain.com in "! +local_domains"? yes (end of list)
 domain.com in "*"?
  list element: *
  domain.com in "*"? yes (matched "*")
+try option transport
+try option unseen
 try option unseen
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
@@ -1359,6 +1381,9 @@ domain.com in "! +local_domains"?
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
 domain.com in "! +local_domains"? yes (end of list)
+try option router_home_directory
+try option set
+processing address_data
  ╭considering: $local_part
  ├──────value: usery
             ╰──(tainted)
@@ -1368,6 +1393,8 @@ domain.com in "! +local_domains"? yes (end of list)
 domain.com in "*"?
  list element: *
  domain.com in "*"? yes (matched "*")
+try option transport
+try option unseen
 try option unseen
 try option interface
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp

diff --git a/test/stderr/5420 b/test/stderr/5420
index 3e535861ce8c5afbe3d081008f6576e8469f77da..e6eb222d787fa92bf2c947c73c1439bd9e5fc8d8 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -26,10 +26,9 @@ try option smtp_banner
  ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+try option acl_smtp_helo
  list element: *
   in limits_advertise_hosts? yes (matched "*")
-try option spf_smtp_comment_template
-try option acl_smtp_helo
  in dsn_advertise_hosts? no (option unset)
 try option acl_smtp_etrn
 try option acl_smtp_vrfy
@@ -688,10 +687,9 @@ try option smtp_banner
  ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+try option acl_smtp_helo
  list element: *
   in limits_advertise_hosts? yes (matched "*")
-try option spf_smtp_comment_template
-try option acl_smtp_helo
  in dsn_advertise_hosts? no (option unset)
 try option acl_smtp_etrn
 try option acl_smtp_vrfy
@@ -1300,10 +1298,9 @@ try option smtp_banner
  ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+try option acl_smtp_helo
  list element: *
   in limits_advertise_hosts? yes (matched "*")
-try option spf_smtp_comment_template
-try option acl_smtp_helo
  in dsn_advertise_hosts? no (option unset)
 try option acl_smtp_etrn
 try option acl_smtp_vrfy