fpm: Add substitution function to test helper class "logtool"

Author: maaarghk

sapi/fpm/tests/logtool.inc

@@ -363,8 +363,13 @@ class LogTool
             $expectedMessage = '\[pool ' . $pool . '\] ' . $expectedMessage;
         }
 
+        // Allow expected message to contain %s and %s for any string or number
+        // as in run-tests.php
+        $expectRe = str_replace('%s', '[^\r\n]+', $expectedMessage);
+        $expectRe = str_replace('%d', '\d+', $expectRe);
+
         $line = rtrim($line);
-        $pattern = sprintf('/^(%s )?%s: %s$/', self::P_TIME, $type, $expectedMessage);
+        $pattern = sprintf('/^(%s )?%s: %s$/', self::P_TIME, $type, $expectRe);
 
         if (preg_match($pattern, $line, $matches) === 0) {
             return $this->error(