Testsuite: perl executable location may differ

diff --git a/test/log/0612 b/test/log/0612
index 447c0f8ae8ebbcd7abc693b1832e4fbf5ec5a67b..31de21b43c2afe34b6c6b505923566c50e5aafde 100644 (file)
--- 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 be4c7b0fe2cb1b4240185d41a5c27e095d71e529..3b0c6bbf064890b99b23bec58a596df4fb9d8065 100755 (executable)
--- 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 717a1506a4a61cd0dd104d6e69baf599ce544241..c65434573f73f889e6af5acd945cf336155906b7 100644 (file)
--- 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