wine-commits December 2022

wine-commits@winehq.org

1 participants
539 discussions

Alexandre Julliard : include: Use proper dllimports for advapi32 functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: fcf5e8c45ba3f530c32b62b6d17ce74898bebcf5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcf5e8c45ba3f530c32b62b6d17ce7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 10:55:01 2022 +0100 include: Use proper dllimports for advapi32 functions. --- dlls/kernelbase/Makefile.in | 2 +- dlls/sechost/security.c | 2 ++ dlls/sechost/service.c | 1 + include/ntsecapi.h | 68 ++++++++++++++++++++++----------------------- include/sddl.h | 20 ++++++------- include/winbase.h | 4 ++- include/wincred.h | 4 ++- include/wincrypt.h | 4 ++- include/winsvc.h | 7 +++-- 9 files changed, 59 insertions(+), 53 deletions(-)

1 0

Alexandre Julliard : winebuild: Put the delay import thunk in a separate section.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 1f5c288b4f4c5fc9faadab5e9bbf24cc9e32e64e URL: https://gitlab.winehq.org/wine/wine/-/commit/1f5c288b4f4c5fc9faadab5e9bbf24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 10:05:49 2022 +0100 winebuild: Put the delay import thunk in a separate section. To work around a binutils bug, cf. https://sourceware.org/bugzilla/show_bug.cgi?id=14339 --- tools/winebuild/import.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index dfda228c4ec..ee3c310546b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1851,6 +1851,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tjmp *%s\n", asm_name( imp_name ) ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tmov $%s,%%eax\n", asm_name( imp_name ) ); output( "\tjmp %s\n", asm_name( delay_load ) ); @@ -1860,6 +1861,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tjmp *%s(%%rip)\n", asm_name( imp_name ) ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tlea %s(%%rip),%%rax\n", asm_name( imp_name ) ); output( "\tjmp %s\n", asm_name( delay_load ) ); @@ -1870,6 +1872,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tldr PC, [IP]\n" ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tldr IP, 1f\n" ); output( "\tldr IP, [IP]\n" ); @@ -1883,6 +1886,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tbr x16\n" ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tadrp x16, %s\n", arm64_page( asm_name( imp_name ) ) ); output( "\tadd x16, x16, #%s\n", arm64_pageoff( asm_name( imp_name ) ) );

1 0

Alexandre Julliard : winebuild: Avoid quoting section names.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 4b59142f34bbc19b67786c5c4cf29af55487ae03 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b59142f34bbc19b67786c5c4cf29a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 10:05:07 2022 +0100 winebuild: Avoid quoting section names. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54060 --- tools/winebuild/import.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 515283fb50f..dfda228c4ec 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1764,20 +1764,20 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\t.long 0\n" ); /* UnloadInformationTableRVA */ output( "\t.long 0\n" ); /* TimeDateStamp */ - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ output( ".L__wine_import_addrs:\n" ); - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ output( ".L__wine_import_names:\n" ); /* required to avoid internal linker errors with some binutils versions */ - output( "\n\t.section \".idata$2\"\n" ); + output( "\n\t.section .idata$2\n" ); } else { - output( "\n\t.section \".idata$2\"\n" ); + output( "\n\t.section .idata$2\n" ); output( "%s\n", asm_globl( import_desc ) ); output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ output( "\t.long 0\n" ); /* TimeDateStamp */ @@ -1785,10 +1785,10 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output_rva( "%s", asm_name( import_name ) ); /* Name */ output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ } @@ -1799,11 +1799,11 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc new_output_as_file(); - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ - output( "\n\t.section \".idata$7\"\n" ); + output( "\n\t.section .idata$7\n" ); output( "%s\n", asm_globl( import_name ) ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); @@ -1891,10 +1891,10 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc break; } - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( "%s\n", asm_globl( imp_name ) ); if (is_delay) output( "\t%s .L__wine_delay_import\n", get_asm_ptr_keyword() ); @@ -1903,14 +1903,14 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc if (by_name) { - output( "\n\t.section \".idata$6\"\n" ); + output( "\n\t.section .idata$6\n" ); output( ".L__wine_import_name:\n" ); output( "\t.short %d\n", odp->hint ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), name ); } /* reference head object to always pull its sections */ - output( "\n\t.section \".idata$7\"\n" ); + output( "\n\t.section .idata$7\n" ); output_rva( "%s", asm_name( import_desc ) ); free( imp_name );

1 0

Francois Gouget : testbot/WineRun*: Downgrade an error to an information message.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: tools Branch: master Commit: 0de021aa9a4c1144d66345443330391553d97953 URL: https://gitlab.winehq.org/winehq/tools/-/commit/0de021aa9a4c1144d6634544333… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 25 02:41:54 2022 +0100 testbot/WineRun*: Downgrade an error to an information message. When a task fails to run (e.g. because of a network error) the message indicating it had to be restarted should not be marked as an error as that would imply the patch is responsible for it when it is most likely not. Similarly it should not be a warning ascribed to the patch. So marking this as an information message makes the most sense. Also note that the fact the task had to be restarted will be visible on the job details page by the presence of the 'old testbot logs' link. --- testbot/bin/WineRunBuild.pl | 8 +++++++- testbot/bin/WineRunReconfig.pl | 8 +++++++- testbot/bin/WineRunTask.pl | 8 +++++++- testbot/bin/WineRunWineTest.pl | 8 +++++++- testbot/lib/WineTestBot/LogUtils.pm | 3 ++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index eb4b2c7d..64fe45ec 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -175,6 +175,12 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # Error handling helpers # +sub LogTaskInfo($) +{ + my ($ErrMessage) = @_; + print STDERR "$Name0:info: ", $ErrMessage; +} + sub LogTaskError($) { my ($ErrMessage) = @_; @@ -208,7 +214,7 @@ sub WrapUpAndExit($;$$$$$$$) } elsif ($Tries >= 1) { - LogTaskError("The previous $Tries run(s) terminated abnormally\n"); + LogTaskInfo("The previous $Tries run(s) terminated abnormally\n"); } # Record result details that may be lost or overwritten by a later run diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index dc9f759b..5d58411b 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -176,6 +176,12 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; # Error handling helpers # +sub LogTaskInfo($) +{ + my ($ErrMessage) = @_; + print STDERR "$Name0:info: ", $ErrMessage; +} + sub LogTaskError($) { my ($ErrMessage) = @_; @@ -210,7 +216,7 @@ sub WrapUpAndExit($;$$$$$$$) } elsif ($Tries >= 1) { - LogTaskError("The previous $Tries run(s) terminated abnormally\n"); + LogTaskInfo("The previous $Tries run(s) terminated abnormally\n"); } # Record result details that may be lost or overwritten by a later run diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index bce67cf2..3b514fb1 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -204,6 +204,12 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # Error handling helpers # +sub LogTaskInfo($) +{ + my ($ErrMessage) = @_; + print STDERR "$Name0:info: ", $ErrMessage; +} + sub LogTaskError($) { my ($ErrMessage) = @_; @@ -242,7 +248,7 @@ sub WrapUpAndExit($;$$$$$$$$) } elsif ($Tries >= 1) { - LogTaskError("The previous $Tries run(s) terminated abnormally\n"); + LogTaskInfo("The previous $Tries run(s) terminated abnormally\n"); } # Record result details that may be lost or overwritten by a later run diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index dd578e47..ad869a96 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -201,6 +201,12 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # Error handling helpers # +sub LogTaskInfo($) +{ + my ($ErrMessage) = @_; + print STDERR "$Name0:info: ", $ErrMessage; +} + sub LogTaskError($) { my ($ErrMessage) = @_; @@ -239,7 +245,7 @@ sub WrapUpAndExit($;$$$$$$$$) } elsif ($Tries >= 1) { - LogTaskError("The previous $Tries run(s) terminated abnormally\n"); + LogTaskInfo("The previous $Tries run(s) terminated abnormally\n"); } # Record result details that may be lost or overwritten by a later run diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3aa59391..07b4dcf5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -91,7 +91,8 @@ sub GetLogLineCategory($) $Line =~ /^Running (?:the tests|WineTest) / or $Line =~ /^Task: (?:ok|tests|Updated)/ or # testbot.log information messages - $Line =~ /^----- Run /) + $Line =~ /^----- Run / or + $Line =~ /:info:/) { return "info"; }

1 0

Francois Gouget : testbot/LogUtils: Remove explicit highlighting of a couple of task messages.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: tools Branch: master Commit: 154bf0482bb327260501cbf8ef21bead9bebda28 URL: https://gitlab.winehq.org/winehq/tools/-/commit/154bf0482bb327260501cbf8ef2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 1 15:57:40 2022 +0100 testbot/LogUtils: Remove explicit highlighting of a couple of task messages. They are now prefixed by the script name and message category (error, warning, etc). --- testbot/lib/WineTestBot/LogUtils.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index fc840f97..3aa59391 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -91,9 +91,7 @@ sub GetLogLineCategory($) $Line =~ /^Running (?:the tests|WineTest) / or $Line =~ /^Task: (?:ok|tests|Updated)/ or # testbot.log information messages - $Line =~ /^----- Run / or - $Line =~ /^The test VM has crashed/ or # Context for an error message - $Line =~ /^The previous \d+ run$s$ terminated abnormally/) + $Line =~ /^----- Run /) { return "info"; }

1 0

Francois Gouget : testbot/TestWTBS: Allow checking the new task counters.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: tools Branch: master Commit: 41f41b29546d13b4c325d273338b880f3b4a141f URL: https://gitlab.winehq.org/winehq/tools/-/commit/41f41b29546d13b4c325d273338… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 3 03:15:51 2022 +0100 testbot/TestWTBS: Allow checking the new task counters. --- testbot/tests/TestWTBS | 103 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 77 insertions(+), 26 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 33074a82..59909287 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -368,7 +368,7 @@ sub LoadTestInfo($) { # Ignore these } - elsif ($Entry !~ /^(?:CurGroup|eCount|eNew|MsgGroups|MsgGroupNames|LineNo|LogName|LogPath)$/) + elsif ($Entry !~ /^(?:CurGroup|eCount|eNew|kCount|kNew|MsgGroups|MsgGroupNames|LineNo|LogName|LogPath)$/) { fail("$FileName: $Entry is not a valid property name"); } @@ -400,6 +400,22 @@ sub LoadTestInfo($) SetDefault($TestInfo, "tasks", "Status", "completed"); SetDefault($TestInfo, "tasks", "HasTask", 1); } + foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", "wine", "wine:build", "wine:test", "wine:module") + { + my $TaskInfo = $TestInfo->{$TaskType}; + if (defined $TaskInfo->{TestFailures}) + { + SetDefault($TestInfo, $TaskType, "NewTestFailures", $TaskInfo->{TestFailures}); + if (CheckValue($TaskInfo->{TestFailures})) + { + SetDefault($TestInfo, $TaskType, "FailedTestUnits", $TaskInfo->{TestFailures} ? 1 : 0); + } + } + if (defined $TaskInfo->{Warnings}) + { + SetDefault($TestInfo, $TaskType, "NewWarnings", $TaskInfo->{Warnings}); + } + } foreach my $BuildType ("build", "wine:build") { next if (!defined $TestInfo->{$BuildType}->{TestUnits}); @@ -913,10 +929,22 @@ still queued or running or have been canceled are automatically skipped to avoid false positives. By default the Status field should be 'completed'. +=item <tasks.NewWarnings> +=item <tasks.Warnings> +=item <tasks.NewTestFailures> =item <tasks.TestFailures> -Checks the value of the task's TestFailures field. -By default the TestFailures field is not checked. +Checks the value of the corresponding task's field. +By default none of these fields are checked. +If Warnings is set and not NewWarnings, then it is assumed it should have the +same value. The same applies to TestFailures and NewTestFailures. + +=item <tasks.FailedTestUnits> + +Checks the value of the corresponding task's field. More precisely: +* FailedTestUnits == undef && TestFailures == undef -> not checked +* FailedTestUnits == undef && TestFailures == 0 -> expect 0 +* FailedTestUnits == undef && TestFailures != 0 -> expect 1 =item <tasks.HasTimeout> @@ -1000,7 +1028,7 @@ sub CheckTask($$$$) my $CheckTimeouts = ($Task->Status eq "completed" and CheckValue($TaskInfo->{HasTimeout})); - my ($ReportFailures, $IgnoreFailures); + my (%Ignore, %Counts); my ($ReportCount, $TimeoutCount, $NewFailures) = (0, 0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { @@ -1028,16 +1056,36 @@ sub CheckTask($$$$) map { $TestUnits->{$MissionType}->{$_} = 1 } (keys %$ReportTestUnits); } - if (CheckValue($MissionInfo->{TestFailures})) + foreach my $Counter ("NewWarnings", "Warnings", "NewTestFailures", "TestFailures") + { + if (CheckValue($MissionInfo->{$Counter})) + { + my $LogCount = $Counter eq "NewWarnings" ? ($LogInfo->{wNew} || 0) - ($LogInfo->{wKnownNew} || 0) : + $Counter eq "Warnings" ? $LogInfo->{wCount} : + $Counter eq "NewFailures" ? ($LogInfo->{eNew} || 0) - ($LogInfo->{eKnownNew} || 0) : + $Counter eq "Failures" ? $LogInfo->{eCount} : + -1; + ok($LogCount <= $MissionInfo->{$Counter}, + "Check $Counter of $LogName in task ". TaskKeyStr($Task)) + or diag("report $Counter count = $LogCount, expected at most $MissionInfo->{$Counter}"); + $Counts{$Counter} += $MissionInfo->{$Counter}; + } + else + { + $Ignore{$Counter} = 1; + } + } + if (CheckValue($MissionInfo->{FailedTestUnits})) { - ok(($LogInfo->{eCount} || 0) <= $MissionInfo->{TestFailures}, - "Check Failures of $LogName in task ". TaskKeyStr($Task)) - or diag("report error count = ", ($LogInfo->{eCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); - $ReportFailures += $MissionInfo->{TestFailures}; + my $LogCount = @{$LogInfo->{FailedTestUnits} || []}; + ok($LogCount == $MissionInfo->{FailedTestUnits}, + "Check FailedTestUnits of $LogName in task ". TaskKeyStr($Task)) + or diag("report FailedTestUnits count = $LogCount expected $MissionInfo->{FailedTestUnits}"); + $Counts{FailedTestUnits} ||= $MissionInfo->{FailedTestUnits}; } else { - $IgnoreFailures = 1; + $Ignore{FailedTestUnits} = 1; } } elsif ($LogName =~ /^testbot\./) @@ -1062,24 +1110,27 @@ sub CheckTask($$$$) } if ($Task->Status eq "completed") { - if ($IsTestTask and ($ReportCount or CheckValue($TaskInfo->{TestUnits}))) + if ($ReportCount) { - if ($IgnoreFailures) - { - # For some mission types (typically test=module) the failure count - # is unpredictable and cannot be checked. - ; # Nothing to do - } - elsif ($ReportCount) - { - # The task's failure count must be compared to the sum of the failure - # counts of each test report. - is($Task->TestFailures, $ReportFailures, "Check Failures of task ". TaskKeyStr($Task)); - } - elsif (CheckValue($TaskInfo->{TestFailures})) + foreach my $Counter ("NewWarnings", "Warnings", "NewTestFailures", "TestFailures", "FailedTestUnits") { - # There is no report if the VM crashed / rebooted - is($Task->TestFailures, $TaskInfo->{TestFailures}, "Check Failures of task ". TaskKeyStr($Task)); + if ($Ignore{$Counter}) + { + # For some mission types (typically test=module) the counter values + # are unpredictable and cannot be checked. + ; # Nothing to do + } + elsif ($ReportCount) + { + # The task's (warning / failure) count must be compared to the sum + # of the counts for each report. + is($Task->$Counter || 0, $Counts{$Counter}, "Check $Counter of task ". TaskKeyStr($Task)); + } + elsif (CheckValue($TaskInfo->{$Counter})) + { + # There is no report if the VM crashed / rebooted + is($Task->$Counter, $TaskInfo->{$Counter}, "Check $Counter of task ". TaskKeyStr($Task)); + } } } elsif (!$IsTestTask and $ReportCount)

1 0

Francois Gouget : testbot/web: Show the number of test units with failed tests.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: tools Branch: master Commit: a318cfe5f94db5ecd46060caa6b96c3509b137c3 URL: https://gitlab.winehq.org/winehq/tools/-/commit/a318cfe5f94db5ecd46060caa6b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 18:20:30 2022 +0100 testbot/web: Show the number of test units with failed tests. --- testbot/web/JobDetails.pl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 506c7602..a4a250fa 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -50,7 +50,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures|FailedTestUnits)$/ ? "" : + return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures)$/ ? "" : $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -85,6 +85,10 @@ sub GenerateHeaderView($$$) { print "<a class='title' title='New / All'>Failures</a>"; } + elsif ($PropertyName eq "FailedTestUnits") + { + print "<a class='title' title='Failed test units'>Units</a>"; + } else { $self->SUPER::GenerateHeaderView($Row, $Col); @@ -164,6 +168,13 @@ sub GenerateDataView($$$) print "", $StepTask->TestFailures, "</a>"; return; } + if ($PropertyName eq "FailedTestUnits" and defined $StepTask->FailedTestUnits) + { + my $class = $StepTask->TestFailures ? "testfail" : "success"; + print "<a href='#k", $StepTask->GetKey(), "'>", + $StepTask->FailedTestUnits, "</a>"; + return; + } $self->SUPER::GenerateDataView($Row, $Col); }

1 0

Francois Gouget : testbot: Track and count the bad test units.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: tools Branch: master Commit: c6b58b0f635a5066d89ebf6eede5d9fae76dcfce URL: https://gitlab.winehq.org/winehq/tools/-/commit/c6b58b0f635a5066d89ebf6eede… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 19:45:32 2022 +0100 testbot: Track and count the bad test units. Build a list of test units that have failures in a given report and save that information in the .errors file. Count the deduplicated bad test units and set the task's FailedTestUnits field accordingly. --- testbot/bin/WineRunTask.pl | 10 ++++++---- testbot/bin/WineRunWineTest.pl | 10 ++++++---- testbot/lib/WineTestBot/LogUtils.pm | 34 +++++++++++++++++++++++++++++++--- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 73908305..bce67cf2 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -212,9 +212,9 @@ sub LogTaskError($) my $ReportNames; -sub WrapUpAndExit($;$$$$$$$) +sub WrapUpAndExit($;$$$$$$$$) { - my ($Status, $TestFailures, $Retry, $TimedOut, $Reason, $NewTestFailures, $NewWarnings, $Warnings) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason, $NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; my $VMResult = $Reason ? $Reason : $Status eq "boterror" ? "boterror" : @@ -258,6 +258,7 @@ sub WrapUpAndExit($;$$$$$$$) $Task->Warnings($Warnings); $Task->NewTestFailures($NewTestFailures); $Task->TestFailures($TestFailures); + $Task->FailedTestUnits($FailedTestUnits); if ($Status eq 'queued') { $Task->Started(undef); @@ -515,7 +516,7 @@ if (!$Pid) my $NewStatus = 'completed'; my ($TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); -my ($NewTestFailures, $NewWarnings, $Warnings); +my ($NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits); Debug(Elapsed($Start), " Waiting for the script (", $Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) { @@ -580,6 +581,7 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { $NewWarnings = ($LogInfo->{wNew} || 0) - ($LogInfo->{wKnownNew} || 0); } + map { $FailedTestUnits->{$_} = 1 } @{$LogInfo->{FailedTestUnits}}; } } elsif (!defined $TAError) @@ -597,4 +599,4 @@ $TA->Disconnect(); FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); -WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut, undef, $NewTestFailures, $NewWarnings, $Warnings); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut, undef, $NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits ? scalar(%$FailedTestUnits) : undef); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c2dccf29..dd578e47 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -209,9 +209,9 @@ sub LogTaskError($) my $ReportNames; -sub WrapUpAndExit($;$$$$$$$) +sub WrapUpAndExit($;$$$$$$$$) { - my ($Status, $TestFailures, $Retry, $TimedOut, $Reason, $NewTestFailures, $NewWarnings, $Warnings) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason, $NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; my $VMResult = defined $Reason ? $Reason : $Status eq "boterror" ? "boterror" : @@ -255,6 +255,7 @@ sub WrapUpAndExit($;$$$$$$$) $Task->Warnings($Warnings); $Task->NewTestFailures($NewTestFailures); $Task->TestFailures($TestFailures); + $Task->FailedTestUnits($FailedTestUnits); if ($Status eq 'queued') { $Task->Started(undef); @@ -486,7 +487,7 @@ if (!$Pid) my $NewStatus = 'completed'; my ($ErrMessage, $TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); -my ($NewTestFailures, $NewWarnings, $Warnings); +my ($NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -613,6 +614,7 @@ foreach my $RptFileName (@$ReportNames) $NewWarnings += ($LogInfo->{wNew} || 0) - ($LogInfo->{wKnownNew} || 0); } } + map { $FailedTestUnits->{$_} = 1 } @{$LogInfo->{FailedTestUnits}}; } elsif (!defined $TAError and $TA->GetLastError() !~ /: No such file or directory/) @@ -635,4 +637,4 @@ $TA->Disconnect(); LogTaskError($ErrMessage) if (defined $ErrMessage); FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); -WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut, undef, $NewTestFailures, $NewWarnings, $Warnings); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut, undef, $NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits ? scalar(%$FailedTestUnits) : undef); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e4145628..fc840f97 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -422,7 +422,11 @@ sub _AddExtra($$;$) { my ($LogInfo, $Error, $Cur) = @_; - $Error = "$Cur->{Dll}:$Cur->{Unit} $Error" if (defined $Cur); + if (defined $Cur) + { + $Error = "$Cur->{Dll}:$Cur->{Unit} $Error"; + $Cur->{Extra}++; + } push @{$LogInfo->{Extra}}, $Error; } @@ -513,6 +517,12 @@ sub _CloseTestUnit($$$) } } } + if ($Cur->{Dll} and + ($Cur->{Rc} or $Cur->{Extra} or $Cur->{LineFailures} or + $Cur->{SummaryFailures} or $Cur->{LineFlaky} or $Cur->{SummaryFlaky})) + { + $LogInfo->{_FailedTestUnits}->{"$Cur->{Dll}:$Cur->{Unit}"} = 1; + } } sub _AddReportMsg($$$$$) @@ -555,6 +565,9 @@ The number of test units. =item TimeoutCount The number of test units that timed out. +=item FailedTestUnits +A list of test units that have failures (flaky or not). + =item eCount, eNew, MsgGroupNames, MsgGroups, BadLog See ParseTaskLog() for details. @@ -575,6 +588,7 @@ sub ParseWineTestReport($$$) TestUnitCount => 0, TimeoutCount => 0, + FailedTestUnits => [], MsgGroupNames => [], MsgGroups => {}, @@ -795,12 +809,12 @@ sub ParseWineTestReport($$$) # The main summary line is missing if ($Rc & 0xc0000000) { - _AddExtra($LogInfo, sprintf("%s:%s crashed (%08x)", $Dll, $Unit, $Rc & 0xffffffff)); + _AddExtra($LogInfo, sprintf("crashed (%08x)", $Rc & 0xffffffff), $Cur); $Cur->{IsBroken} = 1; } elsif ($LogInfo->{IsWineTest} and !$Cur->{IsBroken}) { - _AddExtra($LogInfo, "$Dll:$Unit has no test summary line (early exit of the main process?)"); + _AddExtra($LogInfo, "has no test summary line (early exit of the main process?)", $Cur); } } elsif ($Rc & 0xc0000000) @@ -817,6 +831,7 @@ sub ParseWineTestReport($$$) $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut}); _CloseTestUnit($LogInfo, $Cur, 1); close($LogFile); + $LogInfo->{FailedTestUnits} = [ sort keys %{$LogInfo->{_FailedTestUnits}} ]; # Move the extra errors into their own error group my $ExtraCount = @{$LogInfo->{Extra}}; @@ -1124,11 +1139,24 @@ sub _WriteLogErrorsToFh($$) { my ($Fh, $LogInfo) = @_; + # Save some properties... foreach my $Name ("BadRef", "NoRef") { next if (!defined $LogInfo->{$Name}); print $Fh "p $Name $LogInfo->{$Name}\n"; } + + # some arrays... + foreach my $Name ("FailedTestUnits") + { + next if (!defined $LogInfo->{$Name}); + foreach my $Value (@{$LogInfo->{$Name}}) + { + print $Fh "a $Name $Value\n"; + } + } + + # and the message groups + known failures foreach my $GroupName (@{$LogInfo->{MsgGroupNames}}) { my $Group = $LogInfo->{MsgGroups}->{$GroupName};

1 0

Francois Gouget : testbot/web: Show the number of new failures and warnings.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: tools Branch: master Commit: 4977ed2e9d702fc57e0f94fd9e25dc18a9f9c3b5 URL: https://gitlab.winehq.org/winehq/tools/-/commit/4977ed2e9d702fc57e0f94fd9e2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 28 03:01:16 2022 +0200 testbot/web: Show the number of new failures and warnings. This makes it easier to see which jobs and tasks have new failures. This also makes it obvious when a patch adds new compilation warnings. --- testbot/web/JobDetails.pl | 31 +++++++++++++++++++-- testbot/web/index.pl | 70 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 91 insertions(+), 10 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 035cba8c..506c7602 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -50,7 +50,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|Warnings|NewTestFailures|FailedTestUnits)$/ ? "" : + return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures|FailedTestUnits)$/ ? "" : $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -77,6 +77,14 @@ sub GenerateHeaderView($$$) { print "<a class='title' title='End Time'>Time</a>"; } + elsif ($PropertyName eq "Warnings") + { + print "<a class='title' title='New / All'>Warnings</a>"; + } + elsif ($PropertyName eq "TestFailures") + { + print "<a class='title' title='New / All'>Failures</a>"; + } else { $self->SUPER::GenerateHeaderView($Row, $Col); @@ -132,11 +140,28 @@ sub GenerateDataView($$$) GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); return; } + if ($PropertyName eq "Warnings" and defined $StepTask->Warnings) + { + print "<a href='#k", $StepTask->GetKey(), "'>"; + if (defined $StepTask->NewWarnings) + { + my $class = $StepTask->NewWarnings ? "testfail" : "success"; + print "", $StepTask->NewWarnings, " / "; + } + my $class = $StepTask->Warnings ? "testfail" : "success"; + print "", $StepTask->Warnings, "</a>"; + return; + } if ($PropertyName eq "TestFailures" and defined $StepTask->TestFailures) { + print "<a href='#k", $StepTask->GetKey(), "'>"; + if (defined $StepTask->NewTestFailures) + { + my $class = $StepTask->NewTestFailures ? "testfail" : "success"; + print "", $StepTask->NewTestFailures, " / "; + } my $class = $StepTask->TestFailures ? "testfail" : "success"; - print "<a href='#k", $StepTask->GetKey(), "'>", - $StepTask->TestFailures, "</a>"; + print "", $StepTask->TestFailures, "</a>"; return; } $self->SUPER::GenerateDataView($Row, $Col); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index a3b26ea9..087b80fa 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -25,6 +25,7 @@ package JobStatusBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::ValueFormatter; use WineTestBot::Branches; @@ -34,14 +35,33 @@ use WineTestBot::Utils; my $DAYS_DEFAULT = 4; +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + + # Add some extra columns + my @PropertyDescriptors; + foreach my $PropertyDescriptor (@{$self->{Collection}->GetPropertyDescriptors()}) + { + my $PropertyName = $PropertyDescriptor->GetName(); + next if ($PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/); + next if ($PropertyName eq "BranchName" and !CreateBranches()->MultipleBranchesPresent); + if ($PropertyName eq "Status") + { + push @PropertyDescriptors, CreateBasicPropertyDescriptor("Warnings", "Warnings", !1, !1, "N", 6); + } + push @PropertyDescriptors, $PropertyDescriptor; + } + + return \@PropertyDescriptors; +} + sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/ ? "" : - $PropertyName eq "Submitted" ? ("ro", "timetipdate") : - ($PropertyName eq "BranchName" and !CreateBranches()->MultipleBranchesPresent) ? "" : + return $PropertyName eq "Submitted" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -54,6 +74,14 @@ sub GenerateHeaderView($$$) { print "<a class='title' title='Higher values indicate a lower priority'>Nice</a>"; } + elsif ($PropertyName eq "Status") + { + print "<a class='title' title='Status - New / All failures'>Status</a>"; + } + elsif ($PropertyName eq "Warnings") + { + print "<a class='title' title='New / All warnings'>Warnings</a>"; + } elsif ($PropertyName eq "Submitted") { print "<a class='title' title='Date'>Submitted</a>"; @@ -86,6 +114,26 @@ sub GenerateDataView($$$) print $self->escapeHTML($Job->UserName); } } + elsif ($PropertyName eq "Warnings") + { + my $JobInfo = $self->{JobsInfo}->{$Job->Id}; + if (!exists $JobInfo->{Warnings}) + { + print " "; + } + else + { + my $DetailsLink = $self->GetDetailsLink($Row); + print "<a id='job", $Job->Id, "' href='", $self->escapeHTML($DetailsLink), "'>"; + if (exists $JobInfo->{NewWarnings}) + { + my $class = $JobInfo->{NewWarnings} ? "testfail" : "success"; + print "$JobInfo->{NewWarnings} / "; + } + my $class = $JobInfo->{Warnings} ? "testfail" : "success"; + print "$JobInfo->{Warnings}</a>"; + } + } elsif ($PropertyName eq "Status") { my $DetailsLink = $self->GetDetailsLink($Row); @@ -131,9 +179,14 @@ sub GenerateDataView($$$) if (exists $JobInfo->{TestFailures}) { + print $FailuresPrefix; + if (defined $JobInfo->{NewTestFailures}) + { + my $class = $JobInfo->{NewTestFailures} ? "testfail" : "success"; + print "$JobInfo->{NewTestFailures} / "; + } my $class = $JobInfo->{TestFailures} ? "testfail" : "success"; - my $s = $JobInfo->{TestFailures} == 1 ? "" : "s"; - print "$FailuresPrefix$JobInfo->{TestFailures} test failure$s"; + print "$JobInfo->{TestFailures}"; } elsif ($Status eq "completed") { @@ -320,8 +373,11 @@ sub GenerateBody($) $JobInfo->{DoneTasks}++; } - my $TestFailures = $Task->TestFailures; - $JobInfo->{TestFailures} += $TestFailures if (defined $TestFailures); + foreach my $Counter ("TestFailures", "NewTestFailures", "Warnings", "NewWarnings") + { + my $Value = $Task->$Counter; + $JobInfo->{$Counter} += $Value if (defined $Value); + } } $JobsCollectionBlock->GenerateList();

1 0

Francois Gouget : testbot/WineRun*: Set the new task failure and warning counters.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: tools Branch: master Commit: de42885fb59d7d5f86b8dbf857fb6622eaa16c25 URL: https://gitlab.winehq.org/winehq/tools/-/commit/de42885fb59d7d5f86b8dbf857f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 28 03:00:51 2022 +0200 testbot/WineRun*: Set the new task failure and warning counters. --- testbot/bin/WineRunBuild.pl | 22 +++++++++++++++++++--- testbot/bin/WineRunReconfig.pl | 22 +++++++++++++++++++--- testbot/bin/WineRunTask.pl | 24 +++++++++++++++++++----- testbot/bin/WineRunWineTest.pl | 36 +++++++++++++++++++++++++++++++----- 4 files changed, 88 insertions(+), 16 deletions(-)

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2022