diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-21 23:44:06 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-22 15:23:37 +0100 |
| commit | fbbd45ff5ade30d38ca60ea5aeccc305501c9174 (patch) | |
| tree | 17be713e07ab77592e8ea44a670ec24da5a6c47f /test/scripts/0000-Basic | |
| parent | 6acd9fcf8454b0a18065bcd6ee865c5ddc82e44d (diff) | |
Add automatic macros for compile-time feature options
Diffstat (limited to 'test/scripts/0000-Basic')
| -rw-r--r-- | test/scripts/0000-Basic/0230 | 4 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0290 | 6 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0465 | 4 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0551 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0557 | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230 index b62e31355..92ef10c51 100644 --- a/test/scripts/0000-Basic/0230 +++ b/test/scripts/0000-Basic/0230 @@ -67,7 +67,7 @@ quit # exim -DSERVER=server -bd -oX PORT_D **** -sudo exim -DRT -bs -oMa V4NET.9.8.7.1225 +sudo exim -DOPT -bs -oMa V4NET.9.8.7.1225 mail from:<x@y.x> rcpt to:<x@test.ex> data @@ -75,7 +75,7 @@ this is a message . quit **** -exim -DRT -odi -qf +exim -DOPT -odi -qf **** # # diff --git a/test/scripts/0000-Basic/0290 b/test/scripts/0000-Basic/0290 index f2d69e1d0..f4b63aa8e 100644 --- a/test/scripts/0000-Basic/0290 +++ b/test/scripts/0000-Basic/0290 @@ -1,11 +1,11 @@ # .include and macro tests exim -bP local_interfaces message_size_limit recipients_max remote_sort_domains receive_timeout **** -exim -DRT= -bP receive_timeout +exim -DOPT= -bP receive_timeout **** -exim -DRT -bP receive_timeout +exim -DOPT -bP receive_timeout **** -exim '-D RT = receive_timeout = 4s ' -bP receive_timeout +exim '-D OPT = receive_timeout = 4s ' -bP receive_timeout **** 1 exim -DINC='.include non/absolute' -bP receive_timeout diff --git a/test/scripts/0000-Basic/0465 b/test/scripts/0000-Basic/0465 index 03abe164f..de8b6cbdf 100644 --- a/test/scripts/0000-Basic/0465 +++ b/test/scripts/0000-Basic/0465 @@ -7,7 +7,7 @@ quit 1 exim -f abc@somewhere. xxx **** -exim -DSTD=strip_trailing_dot -d -bs +exim -DOPT=strip_trailing_dot -d -bs mail from:<> rcpt to:<abc@domain.> data @@ -15,7 +15,7 @@ To: abc@domain. . quit **** -exim -DSTD=strip_trailing_dot -f abc@somewhere. xxx@yyy. +exim -DOPT=strip_trailing_dot -f abc@somewhere. xxx@yyy. **** exim -d -bs mail from:<> diff --git a/test/scripts/0000-Basic/0551 b/test/scripts/0000-Basic/0551 index afd5c9b05..d11064c00 100644 --- a/test/scripts/0000-Basic/0551 +++ b/test/scripts/0000-Basic/0551 @@ -6,7 +6,7 @@ Message 1 exim -odi userx@test.ex userz@test.ex Message 2 **** -exim -DLS= -odi userx@test.ex +exim -DLOG_SELECTOR= -odi userx@test.ex Message 3 **** exigrep userx diff --git a/test/scripts/0000-Basic/0557 b/test/scripts/0000-Basic/0557 index 8e05b4719..02ab466d2 100644 --- a/test/scripts/0000-Basic/0557 +++ b/test/scripts/0000-Basic/0557 @@ -1,16 +1,16 @@ # host_find_failed=ignore 1 -exim -DX=# -DY=# -bt userx@test.ex +exim -DFAKE=# -DOPT=# -bt userx@test.ex **** 1 -exim -DY=# -DHOSTS=a.non.exist -bt userx@test.ex +exim -DOPT=# -DHOSTS=a.non.exist -bt userx@test.ex **** 1 -exim -DY=# -DHOSTS=a.non.exist:b.non.exist -bt userx@test.ex +exim -DOPT=# -DHOSTS=a.non.exist:b.non.exist -bt userx@test.ex **** -exim -DY=# -DHOSTS=a.non.exist:127.0.0.1 -bt userx@test.ex +exim -DOPT=# -DHOSTS=a.non.exist:127.0.0.1 -bt userx@test.ex **** -exim -DY=# -DHOSTS=127.0.0.1:b.non.exist:127.0.0.2 -bt userx@test.ex +exim -DOPT=# -DHOSTS=127.0.0.1:b.non.exist:127.0.0.2 -bt userx@test.ex **** 1 exim -DHOSTS=a.non.exist -DHAI=defer -bt userx@test.ex |