Module: tools
Branch: master
Commit: 694e6f4e9812b5df1ec9193be32b6d7fcb835db9
URL: https://source.winehq.org/git/tools.git/?a=commit;h=694e6f4e9812b5df1ec9193…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Wed Feb 10 16:36:17 2021 +0100
testbot/web: Fix the $Task->TestFailures check.
If it has not been set to a numeric value, $Task->TestFailures is
undefined so comparing it to an empty string makes no sense.
Fortunately undef ne "" is false (as well as undef eq "") so the code was
doing the right thing and was not generating a warning since warnings
are not turned on.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/web/index.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testbot/web/index.pl b/testbot/web/index.pl
index 088aea1..2486229 100644
--- a/testbot/web/index.pl
+++ b/testbot/web/index.pl
@@ -131,7 +131,7 @@ sub GenerateDataCell($$$$)
foreach my $Task (@{$Step->Tasks->GetItems()})
{
my $TaskFailures = $Task->TestFailures;
- if ($TaskFailures ne "")
+ if (defined $TaskFailures)
{
$HasTestResult = 1;
$Failures += $TaskFailures;
Module: tools
Branch: master
Commit: 5e7c5603ba0227e6a6f7421ca09989f14d5bd810
URL: https://source.winehq.org/git/tools.git/?a=commit;h=5e7c5603ba0227e6a6f7421…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Wed Feb 10 02:16:01 2021 +0100
testbot/LogUtils: Add support for winedbg's unhandled exception lines.
They replace the test framework's "unhandled exception" lines we get on
Windows but specify neither the test unit nor the process pid. So just
assign them to the current test unit.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50538
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/lib/WineTestBot/LogUtils.pm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 69299da..9164b47 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -631,6 +631,13 @@ sub ParseWineTestReport($$$)
_CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception");
$Cur->{LineFailures}++;
}
+ elsif ($Line =~ /Unhandled exception: .* in .* code /)
+ {
+ # This also replaces a test summary line. The pid is unknown so use 0.
+ $Cur->{Pids}->{0} = 1;
+ $Cur->{SummaryFailures}++;
+ $Cur->{LineFailures}++;
+ }
elsif (($Cur->{Unit} ne "" and
$Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) or
$Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process /)
Module: tools
Branch: master
Commit: 93b9a7e085713d815c5a26b756ef1ff7e7d2201f
URL: https://source.winehq.org/git/tools.git/?a=commit;h=93b9a7e085713d815c5a26b…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Wed Feb 10 02:15:58 2021 +0100
winetest/dissect: Add support for winedbg's unhandled exception lines.
They replace the test framework's "unhandled exception" lines we get on
Windows but specify neither the test unit nor the process pid. So just
assign them to the current test unit.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50538
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
winetest/dissect | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/winetest/dissect b/winetest/dissect
index 12a939d..c20dab6 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -685,6 +685,14 @@ while ($line = <IN>) {
check_unit($l_unit, "unhandled exception");
$failures++;
}
+ elsif ($line =~ /Unhandled exception: .* in .* code /)
+ {
+ # This also replaces a test summary line. The pid is unknown so use 0.
+ $pids{0} = 1;
+ $s_failures++;
+ $failures++;
+ add_test_line("failed", escapeHTML($line));
+ }
elsif (($unit ne "" and
$line =~ /([0-9a-f]+):($unit): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./) or
$line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./)
Module: tools
Branch: master
Commit: 4edf020d007fc4806911983300bc3ec5baa58d1b
URL: https://source.winehq.org/git/tools.git/?a=commit;h=4edf020d007fc4806911983…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Wed Feb 10 02:15:00 2021 +0100
testbot/reporttest: Add a test for winedbg's unhandled exception lines.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/src/reporttest/report.template | 9 +++++++--
testbot/src/reporttest/report.testwtbs | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template
index 14d2cf6..8ff6e14 100644
--- a/testbot/src/reporttest/report.template
+++ b/testbot/src/reporttest/report.template
@@ -314,7 +314,7 @@ advpack:files:0880 done (3) in 0s
advpack:install start dlls/advpack/tests/install.c -
----- WTBS Simple test crash
------ A test unit with a crash
+----- 1/2: A test unit with a wine/test.h "unhandled exception" line
----- Expected assessement: Crash
07b0:install: unhandled exception c0000005 at 0040167C
advpack:install:07b0 done (-1073741819) in 0s
@@ -515,7 +515,12 @@ 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
+comctl32:tab start dlls/comctl32/tests/tab.c -
+----- WTBS Simple test crash
+----- 2/2: A test unit with a winedbg "unhandled exception" line
+----- Expected assessement: Crash
+Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d).
+comctl32:tab:07b0 done (-1073741819) in 0s
stub comctl32:taskdialog
diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs
index 49ef2c0..b444b69 100644
--- a/testbot/src/reporttest/report.testwtbs
+++ b/testbot/src/reporttest/report.testwtbs
@@ -13,7 +13,7 @@ with:
----- TestWTBS -----
-p tests.TestFailures 40
+p tests.TestFailures 41
p build.HasTask 0
a wine.log.GrepV ^Applying patch
@@ -41,6 +41,7 @@ n 0 1234:rebar: unhandled exception c0000005 at 0040167C
n 0 1234:subclass: unhandled exception c0000005 at 0040167C
n 0 Do not cut syslink.c:40: Test failed: Something wrong
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 driver.c:40: Test failed: Something wrong
n 0 driver.c:41: Test succeeded inside todo block: Something right!