Module: tools Branch: master Commit: 173d975b768fa0d7935741eba8a8714d9edbc22f URL: https://source.winehq.org/git/tools.git/?a=commit;h=173d975b768fa0d7935741eb...
Author: Francois Gouget fgouget@codeweavers.com Date: Mon Mar 15 19:28:31 2021 +0100
winetest/dissect: Match additional and new dll 'version' errors.
WineTest.exe now issues more specific errors when it cannot determine a dll's version. Also match the old version error messages that were ignored.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
winetest/dissect | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/winetest/dissect b/winetest/dissect index 919b17a..dbbbe6b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -426,8 +426,10 @@ while ($line = <IN> || "") last if ($line !~ /^\s+([^ =]+)=(.*?)\r?$/); my ($dll, $info) = ($1, $2); $dllinfo{$dll} = { version => $info }; - if ($info eq "dll is missing" or $info eq "dll is a stub" or - $info =~ /^load error/) + if ($info =~ /^dll is (?:missing|native|a stub)/ or + $info =~ /^(?:load error|version error \d+|version not (?:found|present))$/ or + # For compatibility with old WineTest versions + $info =~ /^(?:failed|unknown|version not available)$/) { print SUM "- $dll - missing - - - - -\n"; }