diff --git a/cli/lib/exec/spawn.js b/cli/lib/exec/spawn.js index 469090f75137..2affe11bf6c4 100644 --- a/cli/lib/exec/spawn.js +++ b/cli/lib/exec/spawn.js @@ -76,7 +76,15 @@ const isContainerVulkanStack = /^\s*at (CheckVkSuccessImpl|CreateVkInstance|Init */ const isDebugScenario4 = /^\[[^\]]+debug_utils\.cc[^\]]+\] Hit debug scenario: 4/ -const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isHostVulkanDriverWarning, isContainerVulkanDriverWarning, isContainerVulkanStack, isDebugScenario4] +/** + * In Electron 32.0.0 a new EGL driver message started appearing when running on Linux. This is a benign message. + * https://github.com/electron/electron/issues/43415 + * Sample: + * [78887:1023/114920.074882:ERROR:gl_display.cc(14)] EGL Driver message (Error) eglQueryDeviceAttribEXT: Bad attribute. + */ +const isEGLDriverMessage = /^\[[^\]]+gl_display\.cc[^\]]+\] EGL Driver message \(Error\) eglQueryDeviceAttribEXT: Bad attribute\./ + +const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isHostVulkanDriverWarning, isContainerVulkanDriverWarning, isContainerVulkanStack, isDebugScenario4, isEGLDriverMessage] const isGarbageLineWarning = (str) => { return _.some(GARBAGE_WARNINGS, (re) => { diff --git a/cli/test/lib/exec/spawn_spec.js b/cli/test/lib/exec/spawn_spec.js index 00738df40612..f6756cfe2c08 100644 --- a/cli/test/lib/exec/spawn_spec.js +++ b/cli/test/lib/exec/spawn_spec.js @@ -97,6 +97,8 @@ describe('lib/exec/spawn', function () { at operator() (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:521) [78887:1023/114920.074882:ERROR:debug_utils.cc(14)] Hit debug scenario: 4 + + [18489:0822/130231.159571:ERROR:gl_display.cc(497)] EGL Driver message (Error) eglQueryDeviceAttribEXT: Bad attribute. ` const lines = _