diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-11-08 18:56:19 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-11-08 18:56:19 +0000 |
| commit | 6636495c105ec7c4954585c1b317e049c6cac002 (patch) | |
| tree | 6e826e6cc5a516bea1df31614b8728aaa3b2f64e | |
| parent | 72acdf0f6393ed7c1dec410068549a1c7c60faa3 (diff) | |
Testsuite: perl executable location may differ
| -rw-r--r-- | test/log/0612 | 2 | ||||
| -rwxr-xr-x | test/runtest | 5 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0612 | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/test/log/0612 b/test/log/0612 index 447c0f8ae..31de21b43 100644 --- a/test/log/0612 +++ b/test/log/0612 @@ -1,3 +1,3 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for a 1999-03-02 09:44:33 10HmaX-0005vi-00 <a@myhost.test.ex>: pipe transport output: Hi from pipe -1999-03-02 09:44:33 10HmaX-0005vi-00 == a@myhost.test.ex R=client T=pipe defer (0): Child process of pipe transport returned 5 from command: /bin/perl +1999-03-02 09:44:33 10HmaX-0005vi-00 == a@myhost.test.ex R=client T=pipe defer (0): Child process of pipe transport returned 5 from command: SYSBINDIR/perl diff --git a/test/runtest b/test/runtest index be4c7b0fe..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/%' }, }; diff --git a/test/scripts/0000-Basic/0612 b/test/scripts/0000-Basic/0612 index 717a1506a..c65434573 100644 --- a/test/scripts/0000-Basic/0612 +++ b/test/scripts/0000-Basic/0612 @@ -2,6 +2,8 @@ # #XXX maybe collapse into 0048? # +munge sys_bindir +# exim a **** sleep 1 |