com php-src: Better new-line handling: run-tests.php
| From: | Dmitry Stogov | Date: | Tue, 19 Feb 2019 16:22:42 +0000 |
| Subject: | com php-src: Better new-line handling: run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104747@lists.php.net to get a copy of this message | ||
Commit: b2073253bf82fdd7feb3f219e442fa3e4a39ea9e
Author: Dmitry Stogov <dmitry@zend.com> Tue, 19 Feb 2019 19:22:42 +0300
Parents: 723acab660081c2e8c023c34c0fadb088eb13244
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b2073253bf82fdd7feb3f219e442fa3e4a39ea9e
Log:
Better new-line handling
Changed paths:
M run-tests.php
Diff:
diff --git a/run-tests.php b/run-tests.php
index 42aa51c..49da8c9 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -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'])) {