diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-05-06 19:55:17 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-05-06 19:55:17 +0100 |
| commit | 43ba45ce62100bc1dbc9b04b5d869f59026783f5 (patch) | |
| tree | f2f6692465692c0f13adef405af02910eea7e699 /test | |
| parent | 2a53e2464bfa1a831f544ed44d3690e5c22259a5 (diff) | |
Numeric variable returns
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0624 | 3 | ||||
| -rw-r--r-- | test/log/0624 | 18 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0624 | 2 | ||||
| -rw-r--r-- | test/stdout/0002 | 4 |
4 files changed, 17 insertions, 10 deletions
diff --git a/test/confs/0624 b/test/confs/0624 index d6f00b345..c8178d22b 100644 --- a/test/confs/0624 +++ b/test/confs/0624 @@ -18,6 +18,7 @@ begin acl chk_rcpt: accept domains = OPT logwrite = domain $domain - logwrite = value $domain_data + logwrite = value $domain_data + logwrite = \$0 '$0' \$1 '$1' # End diff --git a/test/log/0624 b/test/log/0624 index 3622b9f42..bbfa98dfe 100644 --- a/test/log/0624 +++ b/test/log/0624 @@ -1,13 +1,19 @@ 1999-03-02 09:44:33 U=CALLER F=<testclient@primaryhostname.ex> rejected RCPT <a@notmatched.ex> 1999-03-02 09:44:33 domain plainstring.ex -1999-03-02 09:44:33 value plainstring.ex +1999-03-02 09:44:33 value plainstring.ex +1999-03-02 09:44:33 $0 'plainstring.ex' $1 '' 1999-03-02 09:44:33 domain headtail.ex -1999-03-02 09:44:33 value *tail.ex +1999-03-02 09:44:33 value *tail.ex +1999-03-02 09:44:33 $0 'headtail.ex' $1 'head' 1999-03-02 09:44:33 domain headregextail.ex -1999-03-02 09:44:33 value ^.*regex +1999-03-02 09:44:33 value ^.*r(e.)ex +1999-03-02 09:44:33 $0 'headregextail.ex' $1 'eg' 1999-03-02 09:44:33 domain primaryhostname.ex -1999-03-02 09:44:33 value primaryhostname.ex +1999-03-02 09:44:33 value primaryhostname.ex +1999-03-02 09:44:33 $0 'primaryhostname.ex' $1 '' 1999-03-02 09:44:33 domain [127.0.0.1] -1999-03-02 09:44:33 value @[] +1999-03-02 09:44:33 value @[] +1999-03-02 09:44:33 $0 '[127.0.0.1]' $1 '' 1999-03-02 09:44:33 domain mx46.test.ex -1999-03-02 09:44:33 value @mx_any/ignore=1.1.1.1 +1999-03-02 09:44:33 value @mx_any/ignore=1.1.1.1 +1999-03-02 09:44:33 $0 '46.test.ex' $1 '' diff --git a/test/scripts/0000-Basic/0624 b/test/scripts/0000-Basic/0624 index d4e5acbbc..3715b125f 100644 --- a/test/scripts/0000-Basic/0624 +++ b/test/scripts/0000-Basic/0624 @@ -21,7 +21,7 @@ RCPT TO:<a@headtail.ex> QUIT **** # -exim -bs '-DOPT=notthis : ^.*regex : nothiseither' +exim -bs '-DOPT=notthis : ^.*r(e.)ex : nothiseither' HELO test MAIL FROM:<testclient> RCPT TO:<a@headregextail.ex> diff --git a/test/stdout/0002 b/test/stdout/0002 index 4345a0969..ea918aebb 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -443,9 +443,9 @@ newline tab\134backslash ~tilde\177DEL\200\201. > match_domain: yes > match_domain: no > -> >x@zz.aa.bb< [] >x@zz.aa.bb< +> >x@zz.aa.bb< [zz] >x@zz.aa.bb< > -> >x@xxxabc< [] >x@xxxabc< +> >x@xxxabc< [abc] >x@xxxabc< > > match_address: yes > match_address: yes |