FreeBSD: Perl no longer in /usr/bin from Ports

[users/jgh/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index a6560aaa717adbe0a9365b1623fc1126178b2bba..ac840379c90ea063095eafcf873394acf35622f2 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1515,7 +1515,7 @@ $munges =
                   )($|[ ]=)/x' },
 
     'sys_bindir' =>
-    { 'mainlog' => 's%/(usr/)?bin/%SYSBINDIR/%' },
+    { 'mainlog' => 's%/(usr/(local/)?)?bin/%SYSBINDIR/%' },
 
     'sync_check_data' =>
     { 'mainlog'   => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/',
@@ -2274,6 +2274,14 @@ elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+
     my(@msglist) = ();
     while (<QLIST>) { push (@msglist, $1) if /^\s*\d+[smhdw]\s+\S+\s+(\S+)/; }
     close(QLIST);
+    # We need the message ids sorted in ascending order.
+    # Message id is: <timestamp>-<pid>-<fractional-time>. On some systems (*BSD) the
+    # PIDs are randomized, so sorting just the whole PID doesn't work.
+    # We do the Schartz' transformation here (sort on
+    # <timestamp><fractional-time>). Thanks to Kirill Miazine
+    @msglist = map { $_->[0] }
+               sort { $a->[1] cmp $b->[1] }
+               map { [$_, join '', (split '-', $_)[0,2]] } @msglist;
 
     # Done backwards just in case there are more than 9