Module: tools
Branch: master
Commit: 7212d7bb13339be0c8ad9f29a5d4585570c411e0
URL: http://source.winehq.org/git/tools.git/?a=commit;h=7212d7bb13339be0c8ad9f29…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Tue Apr 18 12:16:14 2017 +0200
testbot/WineRunTask: Rename some variables to avoid ambiguity.
$TaskTimedOut is set if the task timed out. It may not be set if an
individual test unit times out when running WineTest for instance.
$TaskFailures keeps track of the failure count for the task which is the
cumulated failure count for all its test units.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/bin/WineRunTask.pl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 40e1780..cb12777 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -442,7 +442,7 @@ if (!$Pid)
#
my $NewStatus = 'completed';
-my ($TestFailures, $TimedOut, $TAError, $PossibleCrash);
+my ($TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash);
Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n");
if (!defined $TA->Wait($Pid, $Timeout, $Keepalive))
{
@@ -450,8 +450,8 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive))
if ($ErrMessage =~ /timed out waiting for the child process/)
{
LogTaskError("The task timed out\n");
- $TestFailures = 1;
- $TimedOut = 1;
+ $TaskFailures = 1;
+ $TaskTimedOut = 1;
}
else
{
@@ -626,7 +626,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
}
close($LogFile);
- if (!$IsWineTest or $TimedOut)
+ if (!$IsWineTest or $TaskTimedOut)
{
# This is either not a Wine test, which means the report need not follow
# the Wine test standards, or the report got truncated due to the
@@ -648,7 +648,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
$LogFailures++;
}
# $LogFailures can legitimately be undefined in case of a timeout
- $TestFailures += $LogFailures || 0;
+ $TaskFailures += $LogFailures || 0;
}
else
{
@@ -674,4 +674,4 @@ FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError);
# Wrap up
#
-WrapUpAndExit($NewStatus, $TestFailures);
+WrapUpAndExit($NewStatus, $TaskFailures);
Module: tools
Branch: master
Commit: 5d7b9a8af83f1fbecb84cede591b42b0b5d3df67
URL: http://source.winehq.org/git/tools.git/?a=commit;h=5d7b9a8af83f1fbecb84cede…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Tue Apr 18 12:16:00 2017 +0200
testbot/WineRunTask: Fix a task timeout vs test unit timeout mixup.
If a test unit timed out don't complaining that it did not report some
failures, even if the task as a whole did not time out.
This is important for the WineTest runs.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/bin/WineRunTask.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index dec73a6..40e1780 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -568,7 +568,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
# Verify the summary lines
if (!$CurrentIsPolluted)
{
- if ($LineFailures != 0 and $SummaryFailures == 0 and !$TimedOut)
+ if ($LineFailures != 0 and $SummaryFailures == 0 and $Rc != 258)
{
LogTaskError("$Dll:$Unit has unreported failures\n");
$LogFailures++;
Module: tools
Branch: master
Commit: 91ae35481394cc776fb740f1bc1fad40f50786e9
URL: http://source.winehq.org/git/tools.git/?a=commit;h=91ae35481394cc776fb740f1…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Tue Apr 18 09:33:24 2017 +0200
testbot/reporttest: Make the 'misplaced summary line' test clearer.
By using a test unit name that is not used elsewhere we avoid any
possible confusion.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/src/reporttest/report.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template
index 1eb3724..2d074f9 100644
--- a/testbot/src/reporttest/report.template
+++ b/testbot/src/reporttest/report.template
@@ -340,7 +340,7 @@ atl:module:0920 done (0) in 0s
atl:registrar start dlls/atl/tests/registrar.c -
----- A unit test with a foreign test summary line
----- Expected assessement: "Misplaced test summary line" error
-9876:service: 10 tests executed (0 marked as todo, 1 failures), 0 skipped.
+9876:alien: 10 tests executed (0 marked as todo, 1 failures), 0 skipped.
0922:registrar: 17 tests executed (0 marked as todo, 0 failures), 0 skipped.
atl:registrar:0922 done (0) in 0s
Module: tools
Branch: master
Commit: 48d415aa68ef49ef4b936949261d5c754022efd3
URL: http://source.winehq.org/git/tools.git/?a=commit;h=48d415aa68ef49ef4b936949…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Tue Apr 18 09:33:11 2017 +0200
testbot/reporttest: Fix the failed/todo/skipped message test.
The unit on those lines was wrong.
Added a 'succeeded inside todo block' line.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/src/reporttest/report.template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template
index cfb6083..1eb3724 100644
--- a/testbot/src/reporttest/report.template
+++ b/testbot/src/reporttest/report.template
@@ -400,14 +400,15 @@ comctl32:button skipped dlls/comctl32/tests/button.c -
comctl32:comboex start dlls/comctl32/tests/comboex.c -
----- A unit test with failed, todo and skipped tests in the main process
------ Expected assessement: 1 failure, 1 todo, 1 skip
-advpack.c:40: Test failed: A failure in the main process
-advpack.c:41: Test marked todo: Fixme in the main process
-advpack.c:42: Tests skipped: Skipped in the main process
+----- Expected assessement: 2 failures, 1 todo, 1 skip
+comboex.c:40: Test failed: A failure in the main process
+comboex.c:41: Test succeeded inside todo block: Success in the main process
+comboex.c:42: Test marked todo: Fixme in the main process
+comboex.c:43: Tests skipped: Skipped in the main process
This line says nothing is wrong because it's from the subprocess
1234:comboex: 116 tests executed (0 marked as todo, 0 failures), 0 skipped.
-0c9c:comboex: 116 tests executed (1 marked as todo, 1 failure), 1 skipped.
-comctl32:comboex:0c9c done (1) in 0s
+0c9c:comboex: 116 tests executed (1 marked as todo, 2 failures), 1 skipped.
+comctl32:comboex:0c9c done (2) in 0s
comctl32:datetime start dlls/comctl32/tests/datetime.c -
----- A unit test reporting a failure but with no test failed line
Module: tools
Branch: master
Commit: cfccc4df499a67a247a7657ca7cc327072069805
URL: http://source.winehq.org/git/tools.git/?a=commit;h=cfccc4df499a67a247a7657c…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Tue Apr 18 09:31:46 2017 +0200
testbot/reporttest: Add unhandled exception tests.
Test what happens when the exit code is reported as an unsigned
integer like TestLauncher does.
Also the process exit code should be sufficient for detecting a crash.
This is needed for non-Wine test since they won't print an 'unhandled
exception' line.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/src/reporttest/report.template | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template
index fcb3e59..cfb6083 100644
--- a/testbot/src/reporttest/report.template
+++ b/testbot/src/reporttest/report.template
@@ -311,7 +311,7 @@ advpack:install start dlls/advpack/tests/install.c -
----- A unit test with a crash
----- Expected assessement: Crash
07b0:install: unhandled exception c0000005 at 0040167C
-advpack:install:07b0 done (3221225477) in 0s
+advpack:install:07b0 done (-1073741819) in 0s
amstream:amstream start dlls/amstream/tests/amstream.c -
----- No pid at all
@@ -533,9 +533,29 @@ Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 s
me off
comctl32:syslink:07b0 done (2) in 0s
-stub comctl32:tab
-stub comctl32:toolbar
-stub comctl32:tooltips
+comctl32:tab start dlls/comctl32/tests/tab.c -
+----- A unit test crash with no pid
+----- Expected assessement: crashed
+tab: unhandled exception c0000005 at 0040167C
+comctl32:tab done (-1073741819) in 0s
+
+comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c -
+----- A unit test crash with unsigned exit code (TestLauncher)
+----- Expected assessement: crashed
+taskdialog: unhandled exception c0000005 at 0040167C
+comctl32:taskdialog done (3221225477) in 0s
+
+comctl32:toolbar start dlls/comctl32/tests/toolbar.c -
+----- A unit test crash with no unhandled exception line
+----- Expected assessement: crashed
+comctl32:toolbar done (-1073741819) in 0s
+
+comctl32:tooltips start dlls/comctl32/tests/toolbar.c -
+----- A unit test crash with no unhandled exception line
+----- and an unsigned exit code.
+----- Expected assessement: crashed
+comctl32:tooltips done (3221225477) in 0s
+
stub comctl32:trackbar
stub comctl32:treeview
stub comctl32:updown
Module: tools
Branch: master
Commit: 569eb2b5eca5e1cac217a48677046314538eb9db
URL: http://source.winehq.org/git/tools.git/?a=commit;h=569eb2b5eca5e1cac217a486…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Tue Apr 18 09:31:32 2017 +0200
testbot/reporttest: Merge the garbled test message tests.
Extend it to all types of test messages.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/src/reporttest/report.template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template
index 148456b..fcb3e59 100644
--- a/testbot/src/reporttest/report.template
+++ b/testbot/src/reporttest/report.template
@@ -517,23 +517,23 @@ subclass: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped.
comctl32:subclass:07b0 done (1) in 0s
comctl32:syslink start dlls/comctl32/tests/syslink.c -
------ A unit test with a garbled test failed line
------ Expected assessement: 1 failure
+----- A unit test with garbled test lines
+----- Expected assessement: 2 failures, 1 todo, 1 skip
Multi-threaded and multi-process tests should really try to avoid races in
the report. But analysis tools should also try to be resilient.
Do not cut syslink.c:40: Test failed: Something wrong
me off
-07b0:syslink: 2251 tests executed (0 marked as todo, 1 failures), 0 skipped.
-comctl32:syslink:07b0 done (1) in 0s
-
-comctl32:tab start dlls/comctl32/tests/tab.c -
------ A unit test with a garbled test summary line
------ Expected assessement: Success
-See previous comment.
-Do not cut 07b0:tab: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped.
+Do not cut syslink.c:41: Test succeeded inside todo block: Something right!
+me off
+Do not cut syslink.c:42: Test marked todo: Hello Wine!
+me off
+Do not cut syslink.c:43: Tests skipped: Another time
+me off
+Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 skipped.
me off
-comctl32:tab:07b0 done (0) in 0s
+comctl32:syslink:07b0 done (2) in 0s
+stub comctl32:tab
stub comctl32:toolbar
stub comctl32:tooltips
stub comctl32:trackbar
Module: tools
Branch: master
Commit: 055a589341250fd6248443a19916917b6010ba57
URL: http://source.winehq.org/git/tools.git/?a=commit;h=055a589341250fd6248443a1…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Tue Apr 18 09:31:18 2017 +0200
testbot/reporttest: Adjust some comments.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/src/reporttest/report.template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template
index 8619fbf..148456b 100644
--- a/testbot/src/reporttest/report.template
+++ b/testbot/src/reporttest/report.template
@@ -300,7 +300,7 @@ advpack:advpack start dlls/advpack/tests/advpack.c -
advpack:advpack:0da0 done (0) in 0s
advpack:files start dlls/advpack/tests/files.c -
------ A unit test with a failed test in the main process
+----- A unit test with a failed test in the main process before a subprocess
----- Expected assessement: 1 failure
files.c:20: Test failed: A failure in the main process
4321:files: 99 tests executed (0 marked as todo, 0 failures), 0 skipped.
@@ -394,9 +394,9 @@ comctl32:animate start dlls/comctl32/tests/animate.c -
----- Expected assessement: Timeout
comctl32:animate:0b14 done (258) in 42s
------ Skipping a test unit by user
------ Expected assessement: Skipped by user
comctl32:button skipped dlls/comctl32/tests/button.c -
+----- Skipping a test unit by user request
+----- Expected assessement: Skipped by user
comctl32:comboex start dlls/comctl32/tests/comboex.c -
----- A unit test with failed, todo and skipped tests in the main process
@@ -424,7 +424,7 @@ comctl32:dpa:0998 done (1) in 0s
comctl32:header start dlls/comctl32/tests/header.c -
----- A unit test with a zero exit code despite failures
------ Expected assessement: "Zero exit code" error
+----- Expected assessement: 1 failure, "Zero exit code" error
A non-zero exit code is necessary for 'make test'.
header.c:1: Test failed: Something wrong
0998:header: 16 tests executed (0 marked as todo, 1 failure), 0 skipped.
@@ -452,7 +452,7 @@ comctl32:misc:0998 done (0) in 0s
comctl32:monthcal start dlls/comctl32/tests/monthcal.c -
----- A unit test with a misplaced todo subprocess test summary line
------ Expected assessement: "Misplaced summary line" error
+----- Expected assessement: 1 todo, "Misplaced summary line" error
See the previous misplaced test summary line scenarios.
0148:monthcal: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped.
comctl32:monthcal:0148 done (0) in 9s