Francois Gouget : testbot/WineRunTask: Better detect standard Wine tests.
Module: tools Branch: master Commit: e8d052930991740c3033197c8f1ad201b1958e1c URL: https://source.winehq.org/git/tools.git/?a=commit;h=e8d052930991740c3033197c... Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 26 15:07:43 2018 +0200 testbot/WineRunTask: Better detect standard Wine tests. It's better to take the step dependencies into account and to verify that the previous step was dealing with a Wine patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index f6bc8f1..9faae28 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -441,9 +441,10 @@ if ($Step->Type eq "single") } $Script .= "> $RptFileName\r\n"; - # If StepNo is 1 then the user gave us an executable. Then there is no - # telling if it's going to follow the Wine test standards. - $IsWineTest = ($StepNo != 1); + # If the user gave us an executable there is no telling + # if it is going going to follow the Wine test standards. + $IsWineTest = (defined $Step->PreviousNo and + $Job->Steps->GetItem($Step->PreviousNo)->FileType eq "patchdlls"); } elsif ($Step->Type eq "suite") {
participants (1)
-
Alexandre Julliard