Francois Gouget : testbot/reporttest: Fix inconsistencies with the 'dll versions' block.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Feb 18 16:03:47 2022 +0100

testbot/reporttest: Fix inconsistencies with the 'dll versions' block.

The dlls which are declared as missing or which have other 'load errors'
should not have stub/test results (add placeholders to avoid future errors).

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

---

 testbot/src/reporttest/report.template | 57 ++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template
index 6af2ff5..debd3ce 100644
--- a/testbot/src/reporttest/report.template
+++ b/testbot/src/reporttest/report.template
@@ -16,6 +16,8 @@ Operating system version:
     PlatformId=2
     wProductType=1
 Dll info:
+    activeds=dll is missing
+    adsldp=dll is missing
     advapi32=5.1.2600.5755
     advpack=8.0.6001.18702
     amstream=6.5.2600.5512
@@ -209,6 +211,9 @@ Dll info:
     xinput1_3=version error 5
     xmllite=version not present 2
 Test output:
+----- activeds=dll is missing
+----- adsldp=dll is missing
+
 stub advapi32:cred
 ----- WTBS Simple test patch
 ----- Stubs automatically generate a successful dlls or programs test.
@@ -342,6 +347,9 @@ apphelp.c:44: 2 failures in child process
 0c9c:apphelp: 116 tests executed (0 marked as todo, 3 failures), 0 skipped.
 apphelp:apphelp:0c9c done (3) in 0s
 
+----- atl100=dll is missing
+----- atl80=dll is missing
+
 atl:atl_ax start dlls/atl/tests/atl_ax.c
 ----- WTBS Timeout after a test failure
 ----- Expected assessement: Timeout
@@ -366,6 +374,8 @@ atl:registrar:0922 done (0) in 0s
 avifil32 is missing and thus no test will be run for it and no entry will be
 found in the test report.
 
+----- bcrypt=dll is missing
+
 browseui:autocomplete start dlls/browseui/tests/autocomplete.c
 ----- A test unit with a skipped test
 ----- Expected assessement: Success, 1 skipped
@@ -406,6 +416,8 @@ batch.c:42: Test marked todo: Hello Wine!
 0ddc:batch: 1701 tests executed (0 marked as todo, 0 failures), 0 skipped.
 cmd.exe:batch:0ddc done (0) in 3s
 
+----- combase=dll is missing
+
 comcat:comcat start dlls/comcat/tests/comcat.c
 ----- A test unit with a missing todo test line
 ----- Expected assessement: "Missing todo line" error
@@ -679,6 +691,11 @@ stub crypt32:store
 stub crypt32:str
 stub cryptnet:cryptnet
 stub cryptui:cryptui
+----- d2d1=dll is missing
+----- d3d10core=dll is missing
+----- d3d10_1=dll is missing
+----- d3d10=dll is missing
+----- d3d11=dll is missing
 stub d3d8:device
 stub d3d8:stateblock
 stub d3d8:visual
@@ -686,8 +703,12 @@ stub d3d9:d3d9ex
 stub d3d9:device
 stub d3d9:stateblock
 stub d3d9:visual
+----- d3dcompiler_43=dll is missing
 stub d3drm:d3drm
 stub d3drm:vector
+----- d3dx10_43=dll is missing
+----- d3dx11_43=dll is missing
+----- d3dx9_36=dll is missing
 stub d3dxof:d3dxof
 stub ddrawex:ddrawex
 stub ddrawex:surface
@@ -734,13 +755,17 @@ stub dsound:duplex
 stub dsound:propset
 stub dssenh:dssenh
 stub dswave:dswave
+----- dwrite=dll is missing
 stub dxdiagn:container
 stub dxdiagn:provider
+----- dxgi=dll is missing
+----- explorerframe=dll is missing
 stub faultrep:faultrep
 stub fusion:asmcache
 stub fusion:asmenum
 stub fusion:asmname
 stub fusion:fusion
+----- gameux=dll is missing
 stub gdi32:bitmap
 stub gdi32:brush
 stub gdi32:clipping
@@ -828,6 +853,7 @@ stub mapi32:prop
 stub mapi32:util
 stub mlang:mlang
 stub mmcndmgr:mmcndmgr
+----- mmdevapi=dll is missing
 stub mpr:mpr
 stub msacm32:msacm
 stub mscms:profile
@@ -863,12 +889,19 @@ stub mstask:task
 stub mstask:task_scheduler
 stub mstask:task_trigger
 stub msvcirt:msvcirt
+----- msvcp100=dll is missing
+----- msvcp110=dll is missing
+----- msvcp120=dll is missing
+----- msvcp140=dll is missing
 stub msvcp60:ios
 stub msvcp60:string
 stub msvcp90:ios
 stub msvcp90:misc
 stub msvcp90:string
+----- msvcr100=dll is missing
+----- msvcr120=dll is missing
 stub msvcr90:msvcr90
+----- msvcrtd=dll is missing
 stub msvcrt:cpp
 stub msvcrt:data
 stub msvcrt:dir
@@ -896,6 +929,7 @@ stub netapi32:apibuf
 stub netapi32:ds
 stub netapi32:wksta
 stub netcfgx:netcfgx
+----- netprofm=dll is missing
 stub ntdll:atom
 stub ntdll:change
 stub ntdll:directory
@@ -950,7 +984,9 @@ stub oledb32:database
 stub oledb32:marshal
 stub oledlg:main
 stub opengl32:opengl
+----- packager=dll is missing
 stub pdh:pdh
+----- propsys=dll is missing
 stub psapi:psapi_main
 stub qcap:qcap
 stub qcap:smartteefilter
@@ -1034,13 +1070,16 @@ stub shlwapi:shreg
 stub shlwapi:string
 stub shlwapi:thread
 stub shlwapi:url
+----- slc=dll is missing
 stub snmpapi:util
 stub spoolss:spoolss
 stub sti:sti
 stub sxs:cache
 stub sxs:name
 stub t2embed:t2embed
+----- taskschd=dll is missing
 stub twain_32:dsm
+----- ucrtbase=dll is missing
 stub urlmon:generated
 stub urlmon:misc
 stub urlmon:protocol
@@ -1078,11 +1117,14 @@ stub uxtheme:system
 stub vbscript:createobj
 stub vbscript:run
 stub vbscript:vbscript
+----- vcomp=dll is missing
 stub version:info
 stub version:install
 stub wbemdisp:wbemdisp
 stub wbemprox:query
 stub wbemprox:services
+----- webservices=dll is missing
+----- wer=dll is missing
 stub wiaservc:wia
 stub windowscodecsext:transform
 stub windowscodecs:bitmap
@@ -1117,6 +1159,7 @@ stub winmm:mmio
 stub winmm:timer
 stub winmm:wave
 stub winspool.drv:info
+----- wintab32=dll is missing
 stub wintrust:asn
 stub wintrust:crypt
 stub wintrust:register
@@ -1125,13 +1168,15 @@ stub wlanapi:wlanapi
 stub wldap32:parse
 stub wmiutils:path
 stub wmp:oleobj
-stub ws2_32:protocol
-stub ws2_32:sock
-stub wscript.exe:run
-stub wshom.ocx:wshom
-stub wsnmp32:wsnmp
-stub wtsapi32:wtsapi
+----- wpc=dll is native
+----- ws2_32=dll is a stub
+----- wscript.exe=dll is missing
+----- wshom.ocx=dll is missing an ordinal
+----- wsnmp32=dll is missing an entrypoint
+----- wtsapi32=dll is missing the requested side-by-side version
+----- xaudio2_7=load error 5
 stub xcopy.exe:xcopy
+stub xinput1_3:xinput
 stub xmllite:reader
 
 xmllite:writer start dlls/xmllite/tests/writer.c