[tools] testbot/reporttest: Add more tests from the wtbsuite.

[Francois Gouget]

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 testbot/src/reporttest/report.template | 75 +++++++++++++++++++++-----
 testbot/src/reporttest/report.testwtbs | 21 +++++++-
 2 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template
index 9b285337c..ef3dc7d28 100644
--- a/testbot/src/reporttest/report.template
+++ b/testbot/src/reporttest/report.template
@@ -27,6 +27,7 @@ Dll info:
     bcrypt=dll is missing
     browseui=6.0.2900.5512
     cabinet=5.1.2600.5512
+    chcp.com=1.0
     cmd.exe=5.1.2600.5512
     combase=dll is missing
     comcat=5.0.2600.1
@@ -262,8 +263,7 @@ subprocess.
 advapi32:crypt_sha:08f8 done (3) in 0s
 
 advapi32:eventlog start dlls/advapi32/tests/eventlog.c -
------ WTBS Unreported test failures
------ A test unit with an unreported failed test
+----- A test unit with an unreported failed test despite a non-zero exit code.
 ----- Expected assessement: 1 failure, "Unreported failure" error
 eventlog.c:20: Test failed: Something wrong
 088c:eventlog: 408 tests executed (0 marked as todo, 0 failures), 0 skipped.
@@ -319,7 +319,13 @@ advpack:install start dlls/advpack/tests/install.c -
 07b0:install: unhandled exception c0000005 at 0040167C
 advpack:install:07b0 done (-1073741819) in 0s
 
-stub amstream:amstream
+amstream:amstream start dlls/amstream/tests/amstream.c -
+----- WTBS Unreported test failures
+----- A test unit with an unreported failed test
+----- Expected assessement: 1 failure + "Unreported failure" error
+amstream.c:20: Test failed: Something wrong
+088c:amstream: 408 tests executed (0 marked as todo, 0 failures), 0 skipped.
+amstream:amstream:088c done (0) in 4s
 
 apphelp:apphelp start dlls/apphelp/tests/apphelp.c -
 ----- WTBS Failure propagation from child processes
@@ -336,8 +342,17 @@ 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
 
-stub atl:atl_ax
-stub atl:module
+atl:atl_ax start dlls/atl/tests/atl_ax.c -
+----- WTBS Timeout after a test failure
+----- Expected assessement: Timeout
+atl_ax.c:20: Test failed: A failure before timing out
+atl:atl_ax:0b14 done (258) in 120s
+
+atl:module start dlls/atl/tests/module.c -
+----- WTBS Timeout after a subprocess
+----- Expected assessement: Timeout
+1234:module: 116 tests executed (0 marked as todo, 0 failures), 0 skipped.
+atl:module:0b14 done (258) in 120s
 
 atl:registrar start dlls/atl/tests/registrar.c -
 ----- A test unit with a foreign test summary line
@@ -378,6 +393,12 @@ fdi.c:42: Test marked todo: Hello Wine!
 0690:fdi: 265 tests executed (1 marked as todo, 0 failures), 0 skipped.
 cabinet:fdi:0690 done (0) in 0s
 
+chcp.com:chcp start programs/chcp.com/tests/chcp.c -
+----- WTBS New .com program test directory
+----- Expected assessement: Success
+2021:chcp: 1 tests executed (0 marked as todo, 0 failures), 0 skipped.
+chcp.com:chcp:2021 done (0) in 9s
+
 cmd.exe:batch start programs/cmd/tests/batch.c -
 ----- A test unit with an unreported todo test
 ----- Expected assessement: "Unreported todo line" error
@@ -485,7 +506,11 @@ security.c:42: Tests skipped: Another time
 ----- Keep this stub in case the previous test is mishandled
 stub comctl32:progress
 
-stub comctl32:propsheet
+comctl32:propsheet start dlls/comctl32/tests/propsheet.c -
+----- WTBS Exit abruptly after a subprocess
+----- Expected assessement: Missing summary line
+1234:propsheet: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped.
+comctl32:propsheet:0148 done (0) in 9s
 
 comctl32:rebar start dlls/comctl32/tests/rebar.c -
 ----- A test unit with an unreported crash in a subprocess
@@ -553,7 +578,14 @@ comctl32:toolbar start dlls/comctl32/tests/toolbar.c -
 ----- Expected assessement: crashed
 comctl32:toolbar done (-1073741819) in 0s
 
-stub comctl32:tooltips
+comctl32:tooltips start dlls/comctl32/tests/tooltips.c -
+----- WTBS Timeout in a child process
+----- The time out for child processes is normally shorter than for full test
+----- units and the framework issues a test failure.
+----- Expected assessement: 1 failure
+tooltips.c:350: Test failed: Timed out waiting for the child process
+0b14:tooltips: 3 tests executed (0 marked as todo, 1 failure), 0 skipped.
+comctl32:tooltips:0b14 done (1) in 42s
 
 comctl32:trackbar start dlls/comctl32/tests/trackbar.c -
 ----- WTBS Test failures, todos and skips in a subtest
@@ -567,12 +599,31 @@ driver.c:43: Tests skipped: Another time
 07b1:trackbar: 3 tests executed (1 marked as todo, 2 failures), 1 skipped.
 comctl32:trackbar:07b1 done (2) in 0s
 
-stub comctl32:treeview
-stub comctl32:updown
-stub comdlg32:filedlg
+comctl32:treeview start dlls/comctl32/tests/treeview.c -
+----- WTBS Unreported child process failure
+----- Expected assessement: 2 failures (1+"Returned success despite failure")
+treeview.c:40: Test failed: Unreported failure
+01a9:treeview: 42 tests executed (0 marked as todo, 1 failures), 0 skipped.
+01a8:treeview: 1 tests executed (0 marked as todo, 0 failures), 0 skipped.
+comctl32:treeview:01a8 done (0) in 0s
+
+comctl32:updown start dlls/comctl32/tests/updown.c -
+----- WTBS A misplaced test failure
+----- Expected assessement: 2 failures (1+"Returned success despite failure")
+vorlon.c:40: Test failed: Unreported failure
+01a8:updown: 2 tests executed (0 marked as todo, 0 failures), 0 skipped.
+comctl32:updown:01a8 done (0) in 0s
+
+comdlg32:filedlg start dlls/comdlg32/tests/filedlg.c -
+----- WTBS A misplaced subtest line
+----- Expected assessement: 1 failure
+shadow.c:222: Subtest black
+01a8:filedlg: 10 tests executed (0 marked as todo, 0 failures), 0 skipped.
+comdlg32:filedlg:01a8 done (0) in 0s
+
 stub comdlg32:finddlg
 
-comctl32:fontdlg start dlls/comctl32/tests/fontdlg.c -
+comdlg32:fontdlg start dlls/comdlg32/tests/fontdlg.c -
 ----- Check support for IgnoreExceptions
 ----- Expected assessement: 6 failures
 01bd:fontdlg: unhandled exception c0000005 at 00001111
@@ -587,7 +638,7 @@ fontdlg.c:22: IgnoreExceptions=0
 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00003333).
 fontdlg.c:30: unhandled exception c0000005 in child process 3333
 01bd:fontdlg: 10 tests executed (0 marked as todo, 6 failures), 0 skipped.
-comctl32:fontdlg:01bd done (6) in 0s
+comdlg32:fontdlg:01bd done (6) in 0s
 
 stub comdlg32:itemdlg
 stub comdlg32:printdlg
diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs
index aa78c9e2d..27ca12f1d 100644
--- a/testbot/src/reporttest/report.testwtbs
+++ b/testbot/src/reporttest/report.testwtbs
@@ -13,7 +13,7 @@ with:
 
 
 ----- TestWTBS -----
-p tests.TestFailures 51
+p tests.TestFailures 64
 
 p build.HasTask 0
 a wine.log.GrepV ^Applying patch
@@ -32,10 +32,18 @@ g 0 tests.report.advpack
 n 0 files.c:20: Test failed: A failure in the main process
 n 0 07b0:install: unhandled exception c0000005 at 0040167C
 
+g 0 tests.report.amstream
+n 0 amstream.c:20: Test failed: Something wrong
+
 g 0 tests.report.apphelp
 n 0 apphelp.c:40: Test failed: A failure in the child process
 n 0 apphelp.c:41: Test succeeded inside todo block: Success in the child process
 
+g 0 tests.report.atl
+n 0 atl_ax.c:20: Test failed: A failure before timing out
+n 0 atl_ax: Timeout
+n 0 module: Timeout
+
 g 0 tests.report.comctl32
 n 0 animate: Timeout
 n 0 comboex.c:40: Test failed: A failure in the main process
@@ -48,8 +56,13 @@ n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right!
 n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d).
 n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C
 n 0 taskdialog.c:471: unhandled exception c0000005 in child process 1234
+n 0 tooltips.c:350: Test failed: Timed out waiting for the child process
 n 0 driver.c:40: Test failed: Something wrong
 n 0 driver.c:41: Test succeeded inside todo block: Something right!
+n 0 treeview.c:40: Test failed: Unreported failure
+n 0 vorlon.c:40: Test failed: Unreported failure
+
+g 0 tests.report.comdlg32
 n 0 01bd:fontdlg: unhandled exception c0000005 at 00001111
 n 0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00001111).
 n 0 fontdlg.c:10: unhandled exception c0000005 in child process 1111
@@ -65,6 +78,8 @@ n 0 advapi32:eventlog has unaccounted for failure messages
 n 0 advapi32:lsa has no test summary line (early exit of the main process?)
 n 0 advapi32:registry has no test summary line (early exit of the main process?)
 n 0 advapi32:service returned success despite having failures
+n 0 amstream:amstream has unaccounted for failure messages
+n 0 amstream:amstream returned success despite having failures
 n 0 atl:registrar contains a misplaced test summary message for alien
 n 0 browseui:progressdlg has unaccounted for skip messages
 n 0 cabinet:extract is missing some skip messages
@@ -76,8 +91,12 @@ n 0 comctl32:header returned success despite having failures
 n 0 comctl32:ipaddress has no done line (or it is garbled)
 n 0 comctl32:misc had no start line (or it is garbled)
 n 0 comctl32:monthcal contains a misplaced todo message for security
+n 0 comctl32:propsheet has no test summary line (early exit of the main process?)
 n 0 comctl32:rebar returned success despite having failures
 n 0 comctl32:toolbar has no done line (or it is garbled)
+n 0 comctl32:treeview returned success despite having failures
+n 0 comctl32:updown contains a misplaced failure message for vorlon
+n 0 shadow has a misplaced black subtest line
 n 0 xmllite:writer has unaccounted for failure messages
 n 0 xmllite:writer returned success despite having failures
 ----- TestWTBS -----
-- 
2.20.1