From fa7b17bdbc8c055c475a50791627cd75d257f4f3 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 8 Jul 2019 17:34:47 +0100 Subject: Routers: named variables --- test/confs/0620 | 43 +++++++++++++++++++++++++++++++++++++++++++ test/log/0620 | 3 +++ test/mail/0620.b | 13 +++++++++++++ test/scripts/0000-Basic/0620 | 2 ++ test/stdout/0147 | 1 + test/stdout/0442 | 1 + 6 files changed, 63 insertions(+) create mode 100644 test/confs/0620 create mode 100644 test/log/0620 create mode 100644 test/mail/0620.b create mode 100644 test/scripts/0000-Basic/0620 (limited to 'test') diff --git a/test/confs/0620 b/test/confs/0620 new file mode 100644 index 000000000..b1f48c40e --- /dev/null +++ b/test/confs/0620 @@ -0,0 +1,43 @@ +# Exim test configuration 0166 + +.include DIR/aux-var/std_conf_prefix + + +# ----- Main settings ----- + +domainlist local_domains = test.ex +qualify_domain = test.ex + + +# ----- Routers ----- + +begin routers + +alias: + driver = redirect + debug_print = DEBUG: $r_r1 $r_r2 + data = b + set = r_r1 = $local_part + +user: + driver = accept + debug_print = DEBUG: $r_r1 $r_r2 + set = r_r1 = $local_part + set = r_r2 = $local_part + transport = local_delivery + + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + envelope_to_add + file = DIR/test-mail/$local_part + user = CALLER + debug_print = DEBUG: $r_r1 $r_r2 + headers_add = X-r1: $r_r1\nX-r2: $r_r2 + + +# End diff --git a/test/log/0620 b/test/log/0620 new file mode 100644 index 000000000..8f37c5fc7 --- /dev/null +++ b/test/log/0620 @@ -0,0 +1,3 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => b R=user T=local_delivery +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/mail/0620.b b/test/mail/0620.b new file mode 100644 index 000000000..11db13d23 --- /dev/null +++ b/test/mail/0620.b @@ -0,0 +1,13 @@ +From CALLER@test.ex Tue Mar 02 09:44:33 1999 +Envelope-to: a@test.ex +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-r1: b +X-r2: b + + diff --git a/test/scripts/0000-Basic/0620 b/test/scripts/0000-Basic/0620 new file mode 100644 index 000000000..0f662f153 --- /dev/null +++ b/test/scripts/0000-Basic/0620 @@ -0,0 +1,2 @@ +# router variables +exim -odi a diff --git a/test/stdout/0147 b/test/stdout/0147 index 45e48244b..32ccd8944 100644 --- a/test/stdout/0147 +++ b/test/stdout/0147 @@ -53,6 +53,7 @@ no_retry_use_local_part router_home_directory = new macro2 + 1234 self = freeze senders = +set = transport = T1 transport_current_directory = transport_home_directory = diff --git a/test/stdout/0442 b/test/stdout/0442 index 34c6510fd..0b3a5a62a 100644 --- a/test/stdout/0442 +++ b/test/stdout/0442 @@ -38,6 +38,7 @@ no_retry_use_local_part router_home_directory = self = freeze senders = +set = transport = t1 transport_current_directory = transport_home_directory = -- cgit v1.2.3