X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/23f3dc67a13f71bb8fdf2930052d3fdce85e9774..d753e5994ecfcce17eb44335f33132454bc0257c:/test/runtest?ds=inline diff --git a/test/runtest b/test/runtest index 2ef749f33..3b0c6bbf0 100755 --- a/test/runtest +++ b/test/runtest @@ -1382,7 +1382,10 @@ $munges = 'optional_dsn_info' => { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/' - } + }, + + 'sys_bindir' => + { 'mainlog' => 's%/(usr/)?bin/%SYSBINDIR/%' }, }; @@ -2458,8 +2461,13 @@ if ($parm_exim eq "") # deal with TRUSTED_CONFIG_LIST restrictions unlink("$parm_cwd/test-config") if -e "$parm_cwd/test-config"; -symlink("$parm_cwd/confs/0000", "$parm_cwd/test-config") - or die "Unable to link initial config into place: $!\n"; +open (IN, "$parm_cwd/confs/0000") || + tests_exit(-1, "Couldn't open $parm_cwd/confs/0000: $!\n"); +open (OUT, ">test-config") || + tests_exit(-1, "Couldn't open test-config: $!\n"); +while () { print OUT; } +close(IN); +close(OUT); print("Probing with config file: $parm_cwd/test-config\n"); open(EXIMINFO, "$parm_exim -d -C $parm_cwd/test-config -DDIR=$parm_cwd " .