diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-10 12:12:47 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-10 12:12:47 +0200 |
| commit | 38bca539a13c80ecfdd1084eeb79495fcdd2380a (patch) | |
| tree | 657d9faf12cbde6f135603bf9d8c976288d28b44 /scripts | |
| parent | 94df2f697fa1434bfca0d729a14abd53f3e2586e (diff) | |
| parent | c5bafc3a190e12cec6099d963e15a832849ee996 (diff) | |
| download | php-git-38bca539a13c80ecfdd1084eeb79495fcdd2380a.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Also support absolute Windows filenames
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/dev/bless_tests.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/dev/bless_tests.php b/scripts/dev/bless_tests.php index 8532e9386d..49160d0cc9 100755 --- a/scripts/dev/bless_tests.php +++ b/scripts/dev/bless_tests.php @@ -62,9 +62,9 @@ function getFiles(array $dirsOrFiles): \Iterator { } function normalizeOutput(string $out): string { - $out = preg_replace('/in \/.+ on line \d+$/m', 'in %s on line %d', $out); - $out = preg_replace('/in \/.+:\d+$/m', 'in %s:%d', $out); - $out = preg_replace('/^#(\d+) \/.+\(\d+\):/m', '#$1 %s(%d):', $out); + $out = preg_replace('/in (\/|[A-Z]:\\\\).+ on line \d+$/m', 'in %s on line %d', $out); + $out = preg_replace('/in (\/|[A-Z]:\\\\).+:\d+$/m', 'in %s:%d', $out); + $out = preg_replace('/^#(\d+) (\/|[A-Z]:\\\\).+\(\d+\):/m', '#$1 %s(%d):', $out); $out = preg_replace('/Resource id #\d+/', 'Resource id #%d', $out); $out = preg_replace('/resource\(\d+\) of type/', 'resource(%d) of type', $out); $out = preg_replace( |