Francois Gouget : winetest/dissect: Update the dll version error highlighting.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Apr  8 12:32:37 2021 +0200

winetest/dissect: Update the dll version error highlighting.

Match all the 'dll is missing' errors.
There should be no native dlls when running the tests in Wine so treat
'dlls is native' messages as errors.
Also we don't get the load error 1157 anymore.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48061
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 winetest/dissect | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index 2c89aba..c681c7d 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -838,24 +838,28 @@ mydie "report reached file size limit (runaway test?)" if -s $report >= $maxfile
 $box->{data} .= "<table class=\"output\">\n";
 foreach my $dll (sort keys %dllinfo)
 {
-    if ($dllinfo{$dll}->{version} eq "dll is missing")
+    if ($dllinfo{$dll}->{version} =~ /^dll is missing/)
     {
-        $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing</td></tr>\n", escapeHTML($dll);
+        my $reason = $dllinfo{$dll}->{version};
+        $reason =~ s/dll is //;
+        $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($reason);
     }
     elsif ($dllinfo{$dll}->{version} eq "skipped")
     {
         $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">skipped by user request</td></tr>\n", escapeHTML($dll);
     }
-    elsif ($dllinfo{$dll}->{version} eq "load error 1157")
+    elsif ($dllinfo{$dll}->{version} eq "dll is a stub")
     {
-        $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll);
+        $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">stub</td></tr>\n", escapeHTML($dll);
     }
-    elsif ($dllinfo{$dll}->{version} eq "dll is a stub")
+    elsif ($dllinfo{$dll}->{version} eq "dll is native")
     {
-        $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">dll is a stub</td></tr>\n", escapeHTML($dll);
+        # There should be no native dll in the Wine tests
+        $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll);
     }
     elsif ($dllinfo{$dll}->{version} =~ /^load error/)
     {
+        # Flag unknown errors
         $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n",
                                    escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version});
     }