From cc0e01a2fad81ae87b5b2240ddd776e508e4c59a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 18 Feb 2019 09:56:39 +0100 Subject: Handle exception patterns in bless_tests.php --- scripts/dev/bless_tests.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/dev') diff --git a/scripts/dev/bless_tests.php b/scripts/dev/bless_tests.php index 121a011f9a..67c4defa3b 100644 --- a/scripts/dev/bless_tests.php +++ b/scripts/dev/bless_tests.php @@ -36,7 +36,9 @@ foreach ($it as $file) { } function normalizeOutput(string $out): string { - $out = preg_replace('/in \/.+ on line \d+/', 'in %s on line %d', $out); + $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('/Resource id #\d+/', 'Resource id #%d', $out); return $out; } -- cgit v1.2.1