From a4864546abc0d34e02659d86d4f94dd7a17f002a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 6 Jul 2020 13:23:33 +0200
Subject: ci: Try to improve pytest problemmatchers

Don't match every single line of a stacktrace.
---
 scripts/dev/ci/problemmatchers.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/dev/ci/problemmatchers.py b/scripts/dev/ci/problemmatchers.py
index 0f8ce8d1f..5756dd41b 100644
--- a/scripts/dev/ci/problemmatchers.py
+++ b/scripts/dev/ci/problemmatchers.py
@@ -157,10 +157,21 @@ MATCHERS = {
             "severity": "error",
             "pattern": [
                 {
-                    "regexp": r'^\033\[1m\033\[31m([^\033]*)\033\[0m:(\d+): ?(.*)',
+                    "regexp": r'^\033\[1m\033\[31m([^\033]*)\033\[0m:(\d+): .*',
                     "file": 1,
                     "line": 2,
-                    "message": 3,
+                }
+            ],
+        },
+        {
+            # pytest error lines
+            # E       end2end.fixtures.testprocess.WaitForTimeout: Timed out
+            #         after 15000ms waiting for [...]
+            "severity": "error",
+            "pattern": [
+                {
+                    "regexp": r'^\033\[1m\033\[31mE\s+([^\033]*)\033\[0m$',
+                    "message": 1,
                 }
             ],
         },
-- 
cgit v1.2.3-54-g00ecf