Francois Gouget : testbot: All but a few winediag messages are errors.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 4fdeed539ca798fe1b669da0835f6aff2b81a363
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=4fdeed539ca798fe1b669da0835f6aff2b81a363

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Nov  8 10:53:37 2019 +0100

testbot: All but a few winediag messages are errors.

Only a few winediag messages may legitimately occur when running the
tests. The presence of other winediag messages indicates an error.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/lib/WineTestBot/LogUtils.pm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 2849d60..ea1ad89 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -167,7 +167,19 @@ sub GetLogLineCategory($)
   }
   if ($Line =~ /:winediag:/)
   {
-    return "diag";
+    if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree
+        # calls it as a test.
+        $Line =~ /CorIsLatestSvc If this function is called,/ or
+        # VMs and most test machines don't have a midi port.
+        $Line =~ /No software synthesizer midi port found / or
+        # Most VMs have limited OpenGL support.
+        $Line =~ /None of the requested D3D feature levels is supported / or
+        # The tests are not run as root.
+        $Line =~ /this requires special permissions/)
+    {
+      return "diag";
+    }
+    return "error";
   }
   if (# TestBot script error messages
       $Line =~ /^[a-zA-Z.]+:error: / or