From 06685b44bbff151655dd0e2fbaa8cbb8cd44c08a Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 4 Feb 2016 19:08:56 +0000 Subject: [PATCH] Testsuite: case should not depend on build-option --- test/confs/0572 | 3 +-- test/runtest | 3 ++- test/scripts/0000-Basic/0572 | 2 +- test/stdout/0572 | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/test/confs/0572 b/test/confs/0572 index 2cce49c38..f09e52177 100644 --- a/test/confs/0572 +++ b/test/confs/0572 @@ -28,7 +28,7 @@ my_main_router: route_list = * 127.0.0.1 self = send transport = my_smtp - debug_print = router_name <$router_name> + hide debug_print = router_name <$router_name> no_more @@ -40,7 +40,6 @@ my_smtp: driver = smtp interface = HOSTIPV4 port = PORT_S - hide socks_proxy = 127.0.0.1 port=PORT_D OPT debug_print = transport_name <$transport_name> diff --git a/test/runtest b/test/runtest index 914af5e41..face0dd45 100755 --- a/test/runtest +++ b/test/runtest @@ -1393,12 +1393,13 @@ $munges = { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/' }, - 'optional_nossl' => + 'optional_config' => { 'stdout' => '/^( dkim_(canon|domain|private_key|selector|sign_headers|strict) |gnutls_require_(kx|mac|protocols) |hosts_(requ(est|ire)|try)_(dane|ocsp) |hosts_(avoid|nopass|require|verify_avoid)_tls + |socks_proxy |tls_[^ ]* )($|[ ]=)/x' }, diff --git a/test/scripts/0000-Basic/0572 b/test/scripts/0000-Basic/0572 index 05ba658f7..ae31ea027 100644 --- a/test/scripts/0000-Basic/0572 +++ b/test/scripts/0000-Basic/0572 @@ -3,7 +3,7 @@ # Ought to test a non-priv user, checking "hide", but # the testsuite cannot do that... # -munge optional_nossl +munge optional_config exim -bP spool_directory **** perl -e 'print "\n";' diff --git a/test/stdout/0572 b/test/stdout/0572 index 240a2332a..40397afa5 100644 --- a/test/stdout/0572 +++ b/test/stdout/0572 @@ -68,7 +68,6 @@ protocol = smtp retry_include_ip_address serialize_hosts = size_addition = 1024 -socks_proxy = 127.0.0.1 port=1225 # Exim Configuration (X) # 1 "TESTSUITE/test-config" @@ -91,7 +90,7 @@ begin routers route_list = * 127.0.0.1 self = send transport = my_smtp - debug_print = router_name <$router_name> + hide debug_print = router_name <$router_name> no_more begin transports @@ -100,5 +99,4 @@ begin transports driver = smtp interface = ip4.ip4.ip4.ip4 port = 1224 - hide socks_proxy = 127.0.0.1 port=1225 debug_print = transport_name <$transport_name> -- 2.25.1