diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-22 12:34:21 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-22 12:37:42 +0100 |
| commit | 6acd9fcf8454b0a18065bcd6ee865c5ddc82e44d (patch) | |
| tree | bd433d00e0cf969bad5502a2077b9ac68c5c219c | |
| parent | 2f4df477ae05f0b7180fed5531e014f638a18555 (diff) | |
Testsuite: fix macro conflict (X vs. HEADERS_MAXSIZE)
| -rw-r--r-- | test/confs/0900 | 8 | ||||
| -rw-r--r-- | test/log/4509 | 4 | ||||
| -rw-r--r-- | test/scripts/4500-Domain-Keys-Identified-Mail/4509 | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/test/confs/0900 b/test/confs/0900 index 4c5824545..2eaf01ee3 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -1,7 +1,7 @@ # Exim test configuration 0900 SERVER= Y= -OPT= +LIST= ALLOW= exim_path = EXIM_PATH @@ -58,7 +58,7 @@ begin routers to_server: driver = accept condition = ${if !eq {SERVER}{server}} - transport = remote_smtp${if eq {X}{dkim} {_dkim}} + transport = remote_smtp${if eq {OPT}{dkim} {_dkim}} errors_to = "" fail_remote_domains: @@ -103,12 +103,12 @@ remote_smtp_dkim: command_timeout = 2s final_timeout = 2s -.ifdef X +.ifdef OPT dkim_domain = test.ex dkim_selector = sel dkim_private_key = DIR/aux-fixed/dkim/dkim.private .ifndef HEADERS_MAXSIZE - dkim_sign_headers = OPT + dkim_sign_headers = LIST .endif .endif diff --git a/test/log/4509 b/test/log/4509 index 755a1ec4e..6a222d0b4 100644 --- a/test/log/4509 +++ b/test/log/4509 @@ -1,8 +1,8 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for a@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 988 byte chunk, total 988\\n250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 665 byte chunk, total 665\\n250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for b@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 8524 byte chunk, total 9175\\n250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 8524 byte chunk, total 8852\\n250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** diff --git a/test/scripts/4500-Domain-Keys-Identified-Mail/4509 b/test/scripts/4500-Domain-Keys-Identified-Mail/4509 index 9e4790172..9433815df 100644 --- a/test/scripts/4500-Domain-Keys-Identified-Mail/4509 +++ b/test/scripts/4500-Domain-Keys-Identified-Mail/4509 @@ -4,7 +4,7 @@ exim -bd -DSERVER=server -oX PORT_S **** # # single header signed, short message -exim -DX=dkim -DOPT=From -odf a@test.ex +exim -DOPT=dkim -DLIST=From -odf a@test.ex From: nobody@example.com From: second@example.com @@ -12,7 +12,7 @@ content **** # # single header signed, long message -exim -DX=dkim -DOPT=From -odf b@test.ex +exim -DOPT=dkim -DLIST=From -odf b@test.ex From: nobody@example.com From: second@example.com |