Merge 87aaf31 into 6ae417b

rock-core · Sep 17, 2018 · 338674c · 338674c
2 parents 6ae417b + 87aaf31
commit 338674c
Showing 1 changed file with 25 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -155,39 +155,57 @@
                 "fileLocation": [
                     "absolute"
                 ],
-                "pattern": {
-                    "regexp": "^\\(\\d+\\) .+\\(([^\\)]+)\\): (failed in .* phase)$",
-                    "file": 1,
-                    "message": 2
-                }
+                "pattern": [
+                    {
+                        "regexp": "^\\(\\d+\\) .+\\(([^\\)]+)\\): (failed in .* phase)$",
+                        "kind": "file",
+                        "file": 1,
+                        "message": 2
+                    },
+                    {
+                        "regexp": "^    (.*)",
+                        "message": 1,
+                        "loop": true
+                    }
+                ]
             },
             {
                 "name": "autoproj-cmake-configure-error",
                 "owner": "autoproj",
                 "fileLocation": [
-                    "absolute"
+                    "relative"
                 ],
                 "pattern": [
                     {
                         "regexp": "(?:Autobuild::CMake|Autobuild::Orogen):(?:[^:]+):configure: (?:.+\n)?CMake Error at ([/0-9a-zA-Z\\._-]+):(\\d+).*",
                         "file": 1,
                         "line": 2,
                         "message": 0
+                    },
+                    {
+                        "regexp": "(?:Autobuild::CMake|Autobuild::Orogen):(?:[^:]+):configure: (?!Call Stack)(.*)",
+                        "message": 1,
+                        "loop": true
                     }
                 ]
             },
             {
                 "name": "autoproj-cmake-configure-warning",
                 "owner": "autoproj",
                 "fileLocation": [
-                    "absolute"
+                    "relative"
                 ],
                 "pattern": [
                     {
                         "regexp": "(?:Autobuild::CMake|Autobuild::Orogen):(?:[^:]+):configure: (?:.+\n)?CMake Warning at ([\\/0-9a-zA-Z\\._-]+):(\\d+).*",
                         "file": 1,
                         "line": 2,
                         "message": 0
+                    },
+                    {
+                        "regexp": "(?:Autobuild::CMake|Autobuild::Orogen):(?:[^:]+):configure: (?!Call Stack)(.*)",
+                        "message": 1,
+                        "loop": true
                     }
                 ]
             },