diff options
author | Florian Bruhin <me@the-compiler.org> | 2020-07-03 18:11:53 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2020-07-03 18:56:54 +0200 |
commit | cfc5ac94983d07baa2e1ff97c0382b4e681f536c (patch) | |
tree | 3ceb6c902d4c14b781ba15b135382552a585a610 | |
parent | 2511c3cea47de42e08fe3ef8e45e88d8914fcd04 (diff) | |
download | qutebrowser-cfc5ac94983d07baa2e1ff97c0382b4e681f536c.tar.gz qutebrowser-cfc5ac94983d07baa2e1ff97c0382b4e681f536c.zip |
problemmatcher: Improve/simplify regexes
-rw-r--r-- | scripts/dev/ci/problemmatchers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/dev/ci/problemmatchers.py b/scripts/dev/ci/problemmatchers.py index a10077282..624791c56 100644 --- a/scripts/dev/ci/problemmatchers.py +++ b/scripts/dev/ci/problemmatchers.py @@ -141,13 +141,13 @@ MATCHERS = { "severity": "error", "pattern": [ { - "regexp": r'^E?\s*File "(.*)", line (\d+), in .*$', + "regexp": r'^.*\s+File "(.*)", line (\d+), in .*$', "file": 1, "line": 2, }, { - "regexp": r"E?\s*\w+Error: (.*)", - "message": 1, + "regexp": r"^(\033\[[\d;]+m)*E?\s*(INVALID:)?\s+(\w*Error[^\033]*|\w*Exception[^\033]*)(\033\[0m)?", + "message": 3, } ], }, @@ -158,7 +158,7 @@ MATCHERS = { "severity": "error", "pattern": [ { - "regexp": r'^([^ ]*):(\d+): ?(.*)', + "regexp": r'^\033\[1m\033\[31m([^\033]*)\033\[0m:(\d+): ?(.*)', "file": 1, "line": 2, "message": 3, |