Testsuite: munge for no-DKIM builds

diff --git a/test/runtest b/test/runtest
index 862eb07ae202d71dd8632febf35e64a2de4c4886..06597fe0456d20a54da694eac73522abe3c7a4f5 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1006,7 +1006,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /name=localhost address=::1/;
 
     # drop pdkim debugging header
     next if /name=localhost address=::1/;
 
     # drop pdkim debugging header

-    next if /^PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+$/;
+    next if /^PDKIM( <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+|: no signatures)$/;

 
     # Various other IPv6 lines must be omitted too
 
 
     # Various other IPv6 lines must be omitted too
 

diff --git a/test/stderr/0021 b/test/stderr/0021
index dd1cb8c7b2f4c63134ff23f58ebcdf46975ff6d2..207889b0d0a58c17b8e484f14ea108fe904ef9fb 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -184,7 +184,6 @@ end of ACL "rcpt": ACCEPT
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: added header line
 >>
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: added header line
 >>

-PDKIM: no signatures

 LOG: MAIN
   <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
 Exim version x.yz ....
 LOG: MAIN
   <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
 Exim version x.yz ....

diff --git a/test/stderr/0022 b/test/stderr/0022
index 4b149a426a8d869fd37f67ae6ebc9f47a6974e2e..c558b4226e1168698e0303621c044433a3c25026 100644 (file)
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -53,7 +53,6 @@ P Received: from [V4NET.9.8.7]
        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN


@@ -124,7 +123,6 @@ P Received: from [V4NET.9.8.7]
        (envelope-from <x@y>)
        id 10HmbG-0005vi-00
        for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmbG-0005vi-00
        for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN


@@ -196,7 +194,6 @@ P Received: from [V4NET.9.8.7]
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: warn user message
 >>
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: warn user message
 >>

-PDKIM: no signatures

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN

diff --git a/test/stderr/0303 b/test/stderr/0303
index 5853432ca59b1d0821ee3dd412f99dd54c005ace..edf35c14f2851e36de7357d5ba1575c8e8dc6f0f 100644 (file)
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -101,7 +101,6 @@ P Received: from [V4NET.2.3.4]
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN


@@ -178,7 +177,6 @@ P Received: from host.name.tld ([V4NET.2.3.4])
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN

diff --git a/test/stderr/0371 b/test/stderr/0371
index 9ecca772c81516eb1c1ae8408c53f9b157814917..9ff9306902489ba1b76214f85b4475a636af6ca1 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -87,7 +87,6 @@ P Received: from [V4NET.0.0.0] (helo=something)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 using ACL "data"
 processing "accept"
 check set acl_m0 = $acl_m0; data
 using ACL "data"
 processing "accept"
 check set acl_m0 = $acl_m0; data

diff --git a/test/stderr/0386 b/test/stderr/0386
index 89f313b934e75212e420287bc8d288856a6b77b8..245137ea2a3fe85d974eba111fd71e2223cb7983 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -206,7 +206,6 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
   X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
   X-Warning: This is a test blacklisting message
 >>
   X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
   X-Warning: This is a test blacklisting message
 >>

-PDKIM: no signatures

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp


@@ -390,7 +389,6 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
   X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
   X-Warning: This is a test blacklisting message
 >>
   X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
   X-Warning: This is a test blacklisting message
 >>

-PDKIM: no signatures

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp

diff --git a/test/stderr/0465 b/test/stderr/0465
index 6d5e595937d7782941e0ab9fa4216289f10aebe2..52dcbf3d50afa5ecc6d8ee23dd00f3bf6ed1af20 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -79,7 +79,6 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax


@@ -153,7 +152,6 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax

diff --git a/test/stderr/0487 b/test/stderr/0487
index e65c6a7eb3da6490ff02d469ce3681a3319a204e..ad2daa2f87f7698959474ad48d58eaeab72b40e0 100644 (file)
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -59,7 +59,6 @@ P Received: from CALLER (helo=x.y)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp

diff --git a/test/stderr/0575 b/test/stderr/0575
index c2df9c7da6b5684e25a73275c6e3a576812d0b02..73467881a97b354ec2c772226e6d4364525f044e 100644 (file)
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -48,7 +48,6 @@ P Received: from [V4NET.0.0.0]
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN

diff --git a/test/stderr/5410 b/test/stderr/5410
index 3f2c47994de833ca05630986512ffffca1ba411a..946c48a2a9a1977bd8f8b4b9521e4ed85c80c4b7 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -227,7 +227,6 @@ end of inline ACL: ACCEPT
        for userx@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
        for userx@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------

-PDKIM: no signatures

  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000


@@ -442,7 +441,6 @@ end of inline ACL: ACCEPT
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------

-PDKIM: no signatures

  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000


@@ -657,7 +655,6 @@ end of inline ACL: ACCEPT
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------

-PDKIM: no signatures

  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stderr/5420 b/test/stderr/5420
index d2dc05d945fe81b2e9cee68266ec86fa1752d3e1..97af80b4f693aa27c549f4b982b0a3036bc89d52 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -226,7 +226,6 @@ end of inline ACL: ACCEPT
        for userx@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
        for userx@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------

-PDKIM: no signatures

  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000


@@ -441,7 +440,6 @@ end of inline ACL: ACCEPT
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------

-PDKIM: no signatures

  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000


@@ -656,7 +654,6 @@ end of inline ACL: ACCEPT
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------

-PDKIM: no signatures

  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000