Francois Gouget : testbot/WineRunTask: TestLauncher' s fake test result lines are wrong.
Module: tools Branch: master Commit: d4f2487b1c185f2b866c906482db97ce05080468 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d4f2487b1c185f2b866c90648... Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 21 18:02:31 2017 +0100 testbot/WineRunTask: TestLauncher's fake test result lines are wrong. TestLauncher uses the dll name instead of the test unit name on the fake 'tests skipped' and test summary lines it generates when a dll is missing. Accept the latter to avoid a 'missing test summary line' error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 21ad8e2..0b686f6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -509,7 +509,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) { my ($Pid, $Unit, $Todo, $Failures) = ($1, $2, $3, $4); - if ($Unit eq $CurrentUnit) + # TestLauncher uses the wrong name in its test summary line + if ($Unit eq $CurrentUnit or $Unit eq $CurrentDll) { $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures;
participants (1)
-
Alexandre Julliard