]> granicus.if.org Git - php/commitdiff
Better new-line handling
authorDmitry Stogov <dmitry@zend.com>
Tue, 19 Feb 2019 16:22:42 +0000 (19:22 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 19 Feb 2019 16:22:42 +0000 (19:22 +0300)
run-tests.php

index 42aa51ce6a93e1f3de2d08757c16de68cc1a5aa2..49da8c95bcaa7a6da166e9c01203ff0a510262d0 100755 (executable)
@@ -2523,7 +2523,7 @@ COMMAND $cmd
        show_file_block('out', $output);
 
        if ($preload) {
-               $output = trim(preg_replace("/Warning: Can't preload .*$/m", "", $output));
+               $output = trim(preg_replace("/\n?Warning: Can't preload [^\n]*\n?/", "", $output));
        }
 
        if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) {