[Tools] testbot/WineRunTask: Recognize skipped test units.
Francois Gouget
fgouget at codeweavers.com
Wed May 24 16:56:37 CDT 2017
In case we need to skip test units in the TestBot VMs.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
testbot/bin/WineRunTask.pl | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index f8e69776..12b83f29 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -564,14 +564,17 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
foreach my $Line (<$LogFile>)
{
- if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%)
+ if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%)
{
- my ($Dll, $Unit) = ($1, $2);
+ my ($Dll, $Unit, $Type) = ($1, $2, $3);
# Close the previous test unit
CloseTestUnit(0) if ($CurrentDll ne "");
($CurrentDll, $CurrentUnit) = ($Dll, $Unit);
+
+ # Recognize skipped messages in case we need to skip tests in the VMs
+ $CurrentRc = 0 if ($Type eq "skipped");
}
elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or
($CurrentUnit ne "" and
--
2.11.0
More information about the wine-patches
mailing list