January 2021 - Wine-commits

Zebediah Figura : vkd3d-shader: Implement equality operators in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: 15bbaed9602cc0b9e87b98edda286fa28552fa6b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=15bbaed9602cc0b9e87b98e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:43 2021 -0600 vkd3d-shader: Implement equality operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.l | 4 +++- libs/vkd3d-shader/preproc.y | 26 ++++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 30bea62..76a2f31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,7 +243,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 6779a39..d21ddd1 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -80,6 +80,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"<=" {return T_LE;} <INITIAL>">=" {return T_GE;} +<INITIAL>"==" {return T_EQ;} +<INITIAL>"!=" {return T_NE;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -99,7 +101,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"--" {return T_TEXT;} <INITIAL>"<<"=? {return T_TEXT;} <INITIAL>">>"=? {return T_TEXT;} -<INITIAL>[-+*/%&|^=!]= {return T_TEXT;} +<INITIAL>[-+*/%&|^]= {return T_TEXT;} <INCLUDE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;} diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 6d88419..089fd76 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -334,6 +334,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_LE "<=" %token T_GE ">=" +%token T_EQ "==" +%token T_NE "!=" %token T_DEFINED "defined" %type <integer> primary_expr @@ -341,6 +343,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> mul_expr %type <integer> add_expr %type <integer> ineq_expr +%type <integer> eq_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -473,6 +476,14 @@ body_token_const { $$ = ">="; } + | T_EQ + { + $$ = "=="; + } + | T_NE + { + $$ = "!="; + } | T_DEFINED { $$ = "defined"; @@ -510,7 +521,7 @@ directive } vkd3d_free($2); } - | T_IF ineq_expr T_NEWLINE + | T_IF eq_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -525,7 +536,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF ineq_expr T_NEWLINE + | T_ELIF eq_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -707,3 +718,14 @@ ineq_expr { $$ = $1 >= $3; } + +eq_expr + : ineq_expr + | eq_expr T_EQ ineq_expr + { + $$ = $1 == $3; + } + | eq_expr T_NE ineq_expr + { + $$ = $1 != $3; + }

1 0

Zebediah Figura : vkd3d-shader: Implement bitwise operators in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: c1d2edc9d57d8c584b90b487f9f301bdf3b55b15 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c1d2edc9d57d8c584b90b48… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:44 2021 -0600 vkd3d-shader: Implement bitwise operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 +- libs/vkd3d-shader/preproc.y | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index d21ddd1..4c82bab 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -162,7 +162,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[-()\[\]{},+!*/<>] {return yytext[0];} +<INITIAL>[-()\[\]{},+!*/<>&|^] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 089fd76..fa5e5cc 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -344,6 +344,9 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> add_expr %type <integer> ineq_expr %type <integer> eq_expr +%type <integer> bitand_expr +%type <integer> bitxor_expr +%type <integer> bitor_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -464,6 +467,18 @@ body_token_const { $$ = ">"; } + | '&' + { + $$ = "&"; + } + | '|' + { + $$ = "|"; + } + | '^' + { + $$ = "^"; + } | T_CONCAT { $$ = "##"; @@ -521,7 +536,7 @@ directive } vkd3d_free($2); } - | T_IF eq_expr T_NEWLINE + | T_IF bitor_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -536,7 +551,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF eq_expr T_NEWLINE + | T_ELIF bitor_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -729,3 +744,24 @@ eq_expr { $$ = $1 != $3; } + +bitand_expr + : eq_expr + | bitand_expr '&' eq_expr + { + $$ = $1 & $3; + } + +bitxor_expr + : bitand_expr + | bitxor_expr '^' bitand_expr + { + $$ = $1 ^ $3; + } + +bitor_expr + : bitxor_expr + | bitor_expr '|' bitxor_expr + { + $$ = $1 | $3; + }

1 0

Zebediah Figura : vkd3d-shader: Implement logical operators in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: 338399d5636ae3c2e6204c815821413292902bc6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=338399d5636ae3c2e6204c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:45 2021 -0600 vkd3d-shader: Implement logical operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 4 ++-- libs/vkd3d-shader/preproc.y | 30 ++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 4c82bab..37acc5e 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -82,6 +82,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>">=" {return T_GE;} <INITIAL>"==" {return T_EQ;} <INITIAL>"!=" {return T_NE;} +<INITIAL>"&&" {return T_AND;} +<INITIAL>"||" {return T_OR;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -95,8 +97,6 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>## {return T_CONCAT;} -<INITIAL>"&&" {return T_TEXT;} -<INITIAL>"||" {return T_TEXT;} <INITIAL>"++" {return T_TEXT;} <INITIAL>"--" {return T_TEXT;} <INITIAL>"<<"=? {return T_TEXT;} diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index fa5e5cc..051f94b 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -336,6 +336,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_GE ">=" %token T_EQ "==" %token T_NE "!=" +%token T_AND "&&" +%token T_OR "||" %token T_DEFINED "defined" %type <integer> primary_expr @@ -347,6 +349,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> bitand_expr %type <integer> bitxor_expr %type <integer> bitor_expr +%type <integer> logicand_expr +%type <integer> logicor_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -499,6 +503,14 @@ body_token_const { $$ = "!="; } + | T_AND + { + $$ = "&&"; + } + | T_OR + { + $$ = "||"; + } | T_DEFINED { $$ = "defined"; @@ -536,7 +548,7 @@ directive } vkd3d_free($2); } - | T_IF bitor_expr T_NEWLINE + | T_IF logicor_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -551,7 +563,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF bitor_expr T_NEWLINE + | T_ELIF logicor_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -765,3 +777,17 @@ bitor_expr { $$ = $1 | $3; } + +logicand_expr + : bitor_expr + | logicand_expr T_AND bitor_expr + { + $$ = $1 && $3; + } + +logicor_expr + : logicand_expr + | logicor_expr T_OR logicand_expr + { + $$ = $1 || $3; + }

1 0

Zebediah Figura : vkd3d-shader: Implement the ternary operator in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: e15b884e1a9f149ee0c07abdb83f0d287d4bd5af URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e15b884e1a9f149ee0c07ab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:46 2021 -0600 vkd3d-shader: Implement the ternary operator in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 +- libs/vkd3d-shader/preproc.y | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 37acc5e..1bf14ff 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -162,7 +162,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[-()\[\]{},+!*/<>&|^] {return yytext[0];} +<INITIAL>[-()\[\]{},+!*/<>&|^?:] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 051f94b..aa381e8 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -351,6 +351,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> bitor_expr %type <integer> logicand_expr %type <integer> logicor_expr +%type <integer> expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -483,6 +484,14 @@ body_token_const { $$ = "^"; } + | '?' + { + $$ = "?"; + } + | ':' + { + $$ = ":"; + } | T_CONCAT { $$ = "##"; @@ -548,7 +557,7 @@ directive } vkd3d_free($2); } - | T_IF logicor_expr T_NEWLINE + | T_IF expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -563,7 +572,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF logicor_expr T_NEWLINE + | T_ELIF expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -791,3 +800,10 @@ logicor_expr { $$ = $1 || $3; } + +expr + : logicor_expr + | expr '?' logicor_expr ':' logicor_expr + { + $$ = $1 ? $3 : $5; + }

1 0

Zebediah Figura : vkd3d-shader: Implement the parenthetical operator in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: 6520fb153e6e49c0e9b7b0eef6e711d9c1efa8b6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6520fb153e6e49c0e9b7b0e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:47 2021 -0600 vkd3d-shader: Implement the parenthetical operator in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 -- libs/vkd3d-shader/preproc.y | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 76a2f31..27d933c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,8 +243,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/preproc-if-expr.shader_test \ - tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index aa381e8..7a99543 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -693,6 +693,10 @@ primary_expr $$ = !!preproc_find_macro(ctx, $3); vkd3d_free($3); } + | '(' expr ')' + { + $$ = $2; + } unary_expr : primary_expr

1 0

Francois Gouget : testbot/TestWTBS: Skip the base Windows VMs if there is no base build VM.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: 0d988959e645b52d4c22213132e7343e88171d24 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d988959e645b52d4c22213… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:27 2021 +0100 testbot/TestWTBS: Skip the base Windows VMs if there is no base build VM. Do not report errors about missing Windows tasks if the TestBot only has Wine VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 5f62d63..c5ac9e1 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -696,6 +696,12 @@ foreach my $VM (@{$VMs->GetItems()}) { $HasBaseVM->{$VM->Type} = 1 if ($VM->Role eq "base"); } +if (!$HasBaseVM->{build}) +{ + # Cannot run the tests on Windows if there is no build VM + delete $HasBaseVM->{win32}; + delete $HasBaseVM->{win64}; +} CheckJobs();

1 0

Francois Gouget : testbot/TestWTBS: Tweak the properties propagation.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: 451bccebf110702a789a202652b4954ec85bd563 URL: https://source.winehq.org/git/tools.git/?a=commit;h=451bccebf110702a789a202… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:30 2021 +0100 testbot/TestWTBS: Tweak the properties propagation. Cascade the properties down 1 level at a time rather than straight to the base level. This reduces duplication about which base categories belong in the top-level ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index c5ac9e1..5cadc5d 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -323,9 +323,9 @@ sub LoadTestInfo($) SetDefault($TestInfo, "tasks", "HasTask", 1); # Then propagate the defaults - foreach my $Pair (["win", ["win32", "win64"]], - ["tests", ["win32", "win64", "wine"]], - ["tasks", ["build", "win32", "win64", "wine"]]) + foreach my $Pair (["tasks", ["build", "tests"]], + ["tests", ["win", "wine"]], + ["win", ["win32", "win64"]]) { my ($Src, $TaskTypes) = @$Pair; foreach my $Field (keys %{$TestInfo->{$Src}})

1 0

Francois Gouget : testbot/TestWTBS: Allow matching errors in testbot.log.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: 9b028fed31426847eb847bb0e3e22873bfdeca49 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9b028fed31426847eb847bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:38 2021 +0100 testbot/TestWTBS: Allow matching errors in testbot.log. Tasks have three types of logs: - *.report files that collect the test output. - task.log which collects the messages from the VM-side process that starts the Wine test / build. - testbot.log which collects the server-side messages when some inconsistency is detected or the connection to the VM is lost. Each get their own .errors file but so far only errors in the first two types of logs could be matched. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 5cadc5d..e3909a2 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -300,7 +300,7 @@ sub LoadTestInfo($) foreach my $RawGroupName (@{$RawInfo->{ErrGroupNames}}) { my $GroupName = lcfirst($RawGroupName); - if ($GroupName =~ s/^(tasks|build|tests|win|win32|win64|wine)\.(log|report)\.//) + if ($GroupName =~ s/^(tasks|build|tests|win|win32|win64|wine)\.(report|log|testbot)\.//) { my $ErrInfo = ($TestInfo->{$1}->{"$2.errors"} ||= {}); push @{$ErrInfo->{ErrGroupNames}}, $GroupName; @@ -395,12 +395,13 @@ sub IsMailingListJob($) } =pod -=item <tasks.(log|report).groupname> +=item <tasks.(report|log|testbot).groupname> Verifies the presence of new errors in the specified error log or report of the tasks in the specified category. For this, list the group and errors that are expected to appear; where the group name is prefixed by the task -category and either 'log' or 'report'. +category and either 'report' for the test reports, 'log' for 'task.log', or +'testbot' for 'testbot.log'. For instance: g 0 tests.report.kernel32 @@ -531,6 +532,11 @@ sub CheckTask($$$$) map { $TestUnits->{wine}->{$_} = 1 } (keys %$ReportTestUnits); } } + elsif ($LogName =~ /^testbot\./) + { + $LogType = "testbot"; + } + if ($TaskInfo->{"$LogType.errors"}) { CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"},

1 0

Francois Gouget : testbot/TestWTBS: Also check the build tasks.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: 79c546194f92d83da849d56a02d133681f7d5e30 URL: https://source.winehq.org/git/tools.git/?a=commit;h=79c546194f92d83da849d56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:45 2021 +0100 testbot/TestWTBS: Also check the build tasks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e3909a2..cc3037f 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -660,7 +660,7 @@ sub CheckJobTree($) # which VMs to run the test on. if (IsMailingListJob($Job)) { - foreach my $Type ("win32", "win64", "wine") + foreach my $Type ("build", "win32", "win64", "wine") { next if (!$HasBaseVM->{$Type});

1 0

Francois Gouget : testbot/TestWTBS: Fix the TestUnits check in case of build errors.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: b47c3dd0180168c53c267972a32821c16cca4a30 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b47c3dd0180168c53c26797… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:47 2021 +0100 testbot/TestWTBS: Fix the TestUnits check in case of build errors. In case of a build error the TestUnits check must be skipped on Wine VMs since the test units list is built from the test reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index cc3037f..01f46bf 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -514,6 +514,12 @@ sub CheckTask($$$$) { is($Task->Status, $TaskInfo->{Status}, "Check Status of task ". TaskKeyStr($Task)); } + if ($Task->Status =~ /^bad/) + { + # It makes no sense to check which test units were run in case of a build + # error. + $TestUnits->{$TaskType}->{"*skipped*"} = 1; + } my $ReportCount = 0; foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) @@ -670,6 +676,8 @@ sub CheckJobTree($) $HasTask->{$Type} ||= 0; is($HasTask->{$Type}, $TypeInfo->{HasTask}, "Check the presence of $Type tasks for job ". $Job->Id); } + + next if ($TestUnits->{$Type}->{"*skipped*"}); if (CheckValue($TypeInfo->{TestUnits})) { foreach my $TestUnit (split / +/, $TypeInfo->{TestUnits})

1 0