summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-02-17 15:21:53 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2018-02-17 16:01:13 +0000
commitea89660dc06ba1f1e919bd0d6564619831d64167 (patch)
treebf64a18977080081475feb6a2b0f9dbc43b9d4de /test
parentc0635b6dfe65ee24c2fb8d165beabc608d2fd1a5 (diff)
Testsuite: munge for no-DKIM builds
Diffstat (limited to 'test')
-rwxr-xr-xtest/runtest2
-rw-r--r--test/stderr/00211
-rw-r--r--test/stderr/00223
-rw-r--r--test/stderr/03032
-rw-r--r--test/stderr/03711
-rw-r--r--test/stderr/03862
-rw-r--r--test/stderr/04652
-rw-r--r--test/stderr/04871
-rw-r--r--test/stderr/05751
-rw-r--r--test/stderr/54103
-rw-r--r--test/stderr/54203
11 files changed, 1 insertions, 20 deletions
diff --git a/test/runtest b/test/runtest
index 862eb07ae..06597fe04 100755
--- 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 /^PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+$/;
+ next if /^PDKIM( <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+|: no signatures)$/;
# Various other IPv6 lines must be omitted too
diff --git a/test/stderr/0021 b/test/stderr/0021
index dd1cb8c7b..207889b0d 100644
--- 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
>>
-PDKIM: no signatures
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 4b149a426..c558b4226 100644
--- 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
-PDKIM: no signatures
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
-PDKIM: no signatures
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
>>
-PDKIM: no signatures
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
diff --git a/test/stderr/0303 b/test/stderr/0303
index 5853432ca..edf35c14f 100644
--- 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
-PDKIM: no signatures
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
-PDKIM: no signatures
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
diff --git a/test/stderr/0371 b/test/stderr/0371
index 9ecca772c..9ff930690 100644
--- 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
-PDKIM: no signatures
using ACL "data"
processing "accept"
check set acl_m0 = $acl_m0; data
diff --git a/test/stderr/0386 b/test/stderr/0386
index 89f313b93..245137ea2 100644
--- 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
>>
-PDKIM: no signatures
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
>>
-PDKIM: no signatures
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 6d5e59593..52dcbf3d5 100644
--- 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
-PDKIM: no signatures
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
-PDKIM: no signatures
using ACL "check_data"
processing "accept"
check verify = header_syntax
diff --git a/test/stderr/0487 b/test/stderr/0487
index e65c6a7eb..ad2daa2f8 100644
--- 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
-PDKIM: no signatures
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 c2df9c7da..73467881a 100644
--- 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
-PDKIM: no signatures
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
diff --git a/test/stderr/5410 b/test/stderr/5410
index 3f2c47994..946c48a2a 100644
--- 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 ------------
-PDKIM: no signatures
┌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 ------------
-PDKIM: no signatures
┌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 ------------
-PDKIM: no signatures
┌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 d2dc05d94..97af80b4f 100644
--- 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 ------------
-PDKIM: no signatures
┌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 ------------
-PDKIM: no signatures
┌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 ------------
-PDKIM: no signatures
┌considering: ${tod_full}
├──expanding: ${tod_full}
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 11:14:39 +0000