- Wine-Devel - list.winehq.org

[website] German translation for release 6.3
by Julian Rüger March 1, 2021

March 1, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.2
by Julian Rüger March 1, 2021

March 1, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.1
by Julian Rüger March 1, 2021

March 1, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[tools] testbot/LibvirtTool: Allow cleanly powering off VMs.
by Francois Gouget March 1, 2021

March 1, 2021

If a snapshot has the '-off' suffix, try cleanly powering of the VM after running the tests. This may avoid perma-crashing the GPU when using PCI-passthrough. Forcefully power of the VM as usual if it does not cleanly shuts down within $WaitForShutdown seconds. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 50 +++++++++++++++++++++++++++++-- testbot/lib/WineTestBot/Config.pm | 9 ++++-- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a2939e738..59adf2f7f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -323,9 +323,55 @@ sub Monitor() sub PowerOff() { - # Power off VMs no matter what their initial status is + my $Domain = $VM->GetDomain(); + if ($VM->IdleSnapshot =~ /-off$/ and $Domain->IsPoweredOn()) + { + # Attempt to perform a clean shutdown. + # Use SetTime() to detect if privileged operations are allowed. + my $TA = $VM->GetAgent(); + if (!$TA->SetTime()) + { + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + $TA->Disconnect(); + $TA = $VM->GetAgent(1); + if (!$TA->SetTime()) + { + Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; + $TA->Disconnect(); + $TA = undef; + } + } + if ($TA) + { + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/p", "/d", "00:00"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running @$Cmd\n"); + if (!$TA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; + } + else + { + Debug(Elapsed($Start), " Waiting for the VM to power off\n"); + my $Deadline = time() + $WaitForShutdown; + while ($Domain->IsPoweredOn()) + { + if (time() >= $Deadline) + { + Error "Timed out waiting for ". $VM->Name ." to perform a clean shutdown. Forcefully shutting down now...\n"; + last; + } + sleep(1); + } + } + } + } + + # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $VM->GetDomain()->PowerOff(); + my $ErrMessage = $Domain->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 312797229..a4aba2c55 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -29,7 +29,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir %RepoURLs $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert - $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail + $VMToolTimeout $WaitForShutdown $MaxVMErrors $MaxTaskTries + $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -45,8 +46,8 @@ require Exporter; @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir %RepoURLs $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot - $SleepAfterRevert - $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail + $SleepAfterRevert $VMToolTimeout $WaitForShutdown + $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -101,6 +102,8 @@ $SleepAfterRevert = 0; # How long to wait before considering a VM operation is stuck. In particular # for reverts this should take into account the time it may need to boot. $VMToolTimeout = 6 * 60; +# How long to wait for the VM to perform a clean shutdown. +$WaitForShutdown = 30; # Notify the administrator that a VM probably needs manual fixing after # $MaxVMErrors consecutive revert errors. -- 2.20.1

1 0

[tools] testbot/TestWTBS: Fix the TestFailures checks for pure wine:build tasks.
by Francois Gouget March 1, 2021

March 1, 2021

Such tasks will obviously not have any failure from the test units so take that into account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 74 +++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 1467c4b4e..edf097de2 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -859,18 +859,6 @@ sub CheckTask($$$$) { my ($Task, $TaskType, $TestInfo, $TestUnits) = @_; - my $TaskInfo = $TestInfo->{$TaskType}; - if (CheckValue($TaskInfo->{Status})) - { - 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; - } - # Assume the VM's Missions field has not changed since the tests were run my ($ErrMessage, $Missions) = ParseMissionStatement($Task->Missions); if (@$Missions != 1) @@ -879,22 +867,42 @@ sub CheckTask($$$$) return; } - my %ReportTypes; + my (%ReportTypes, $IsTestTask); if ($TaskType =~ /^win/) { + $IsTestTask = 1 if ($TaskType =~ /^win(?:32|64)$/); foreach my $Mission (@{$Missions->[0]->{Missions}}) { my $ReportName = GetMissionBaseName($Mission) .".report"; my $MissionType = $TaskType; - $MissionType .= ":". ($Mission->{test} || "test") if ($TaskType eq "wine"); + if ($TaskType eq "wine") + { + my $Test = $Mission->{test} || "test"; + $IsTestTask = 1 if ($Test =~ /^(?:test|module)/); + $MissionType .= ":$Test"; + } $ReportTypes{$ReportName} = $MissionType; } } + my $TestType = ($TaskType eq "wine" and !$IsTestTask) ? + "wine:build" : $TaskType; + my $TaskInfo = $TestInfo->{$TestType}; + + if (CheckValue($TaskInfo->{Status})) + { + 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 $CheckTimeouts = ($Task->Status eq "completed" and CheckValue($TaskInfo->{HasTimeout})); - my $ExpectedFailures; + my ($ReportFailures, $IgnoreFailures); my ($ReportCount, $TimeoutCount, $NewFailures) = (0, 0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { @@ -903,7 +911,7 @@ sub CheckTask($$$$) $NewFailures += $LogInfo->{NewCount} || 0; # Get the mission-specific "wine:xxx" report directives - my $MissionType = $ReportTypes{$LogName} || $TaskType; + my $MissionType = $ReportTypes{$LogName} || $TestType; my $MissionInfo = $TestInfo->{$MissionType}; my $LogType = "log"; if ($LogName =~ /\.report$/) @@ -924,11 +932,11 @@ sub CheckTask($$$$) ok(($LogInfo->{ErrCount} || 0) <= $MissionInfo->{TestFailures}, "Check Failures of $LogName in task ". TaskKeyStr($Task)) or diag("report error count = ", ($LogInfo->{ErrCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); - $ExpectedFailures += $MissionInfo->{TestFailures}; + $ReportFailures += $MissionInfo->{TestFailures}; } else { - $ExpectedFailures = undef; + $IgnoreFailures = 1; } } elsif ($LogName =~ /^testbot\./) @@ -951,20 +959,34 @@ sub CheckTask($$$$) } if ($Task->Status eq "completed") { - if (defined $ExpectedFailures) + if ($IsTestTask and ($ReportCount or CheckValue($TaskInfo->{TestUnits}))) + { + 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})) + { + # There is no report if the VM crashed / rebooted + is($Task->TestFailures, $TaskInfo->{TestFailures}, "Check Failures of task ". TaskKeyStr($Task)); + } + } + elsif (!$IsTestTask and $ReportCount) { - is($Task->TestFailures, $ExpectedFailures, "Check Failures of task ". TaskKeyStr($Task)); + fail("A $TestType task should not have $ReportCount test reports"); } elsif (CheckValue($TaskInfo->{TestFailures}) and !$ReportCount) { - # Scale the expected TestFailures count with the number of times the test - # was run, i.e. $ReportCount, or take it as is if no report is available. is($Task->TestFailures, $TaskInfo->{TestFailures}, "Check Failures of task ". TaskKeyStr($Task)); } - # else there are reports for which we cannot check the TestFailures count. - # In particular this can happen if the test failure count can be checked - # for test=test but not for test=module. Then whether TestFailures can be - # checked or not depends on the missions mix. } return $NewFailures; } -- 2.20.1

1 0

[tools] testbot/TestWTBS: Adjust the TestUnits check to the wine test/module missions.
by Francois Gouget March 1, 2021

March 1, 2021

Don't complain that the test=test or test=module case is missing test units if there was no mission of that type. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index edf097de2..04487c4bc 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -882,6 +882,7 @@ sub CheckTask($$$$) $MissionType .= ":$Test"; } $ReportTypes{$ReportName} = $MissionType; + $TestUnits->{$MissionType} ||= {}; } } my $TestType = ($TaskType eq "wine" and !$IsTestTask) ? @@ -1191,6 +1192,9 @@ sub CheckJobTree($;$) my @MissionTypes = $Type eq "wine" ? ("wine:test", "wine:module") : ($Type); foreach my $MissionType (@MissionTypes) { + # Skip if there was no task running this type of mission + next if (!$TestUnits->{$MissionType}); + my $MissionInfo = $TestInfo->{$MissionType}; next if (!CheckValue($MissionInfo->{TestUnits})); -- 2.20.1

1 0

[tools] testbot/TestWTBS: Tweak the message for failed TestUnits module matches.
by Francois Gouget March 1, 2021

March 1, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 04487c4bc..e3b0a3ce6 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1217,7 +1217,7 @@ sub CheckJobTree($;$) $TestUnits->{$MissionType}->{$TestUnit} = 0; $Matched = 1; } - ok($Matched, "Check that $MissionType VMs ran $TestGrep for job $JobId") + ok($Matched, "Check that $MissionType VMs ran $TestGrep tests for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); } my @ExtraUnits = grep { $TestUnits->{$MissionType}->{$_} } keys %{$TestUnits->{$MissionType}}; -- 2.20.1

1 0

[tools] testbot/TestWTBS: Don't report failed test unit matches twice.
by Francois Gouget March 1, 2021

March 1, 2021

If a module:unit entry did not match, it's certainly not going to match as a module name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This issue was found thanks to the testwtbsuite test suite. --- testbot/tests/TestWTBS | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e3b0a3ce6..2a6b66e6d 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1209,6 +1209,7 @@ sub CheckJobTree($;$) } fail("Check that $MissionType VMs ran $TestGrep for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); + next; } my $Matched; foreach my $TestUnit (keys %{$TestUnits->{$MissionType}}) -- 2.20.1

1 0

[tools] testbot/TestWTBS: Improve the error checking documentation.
by Francois Gouget March 1, 2021

March 1, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 2a6b66e6d..6a19f138b 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -654,14 +654,23 @@ n 0 comm.c:2210: Test failed: WTBS Simulate an unreported test failure g 0 tests.report.Report validation errors n 0 kernel32:comm has unaccounted for failure messages -This checks that the 'comm.c' failure appears in the 'kernel32' group -of the reports of all test tasks; that the TestBot issues a report consistency -failure as well; and that no other new error is present. If no preexisting -errors are expected, that is if test unit produces no failure when run outside -the test suite, then one could also issue the following check: +This checks that the 'comm.c' failure appears in the 'kernel32' group of the +reports of all test tasks; that the TestBot issues a report consistency +failure as well; that no other new error is present in either group; and that +there are no other error groups. + +If no preexisting errors are expected, that is if the test unit produces no +failure when run outside the test suite, then one could also issue the +following check: p tests.TestFailures 2 +Note that if there is no group directive this test is skipped. So to check that +there is no error one would declare an empty group such as below, though a +'TestFailures 0' check seems like a clearer and better approach. + +g 0 tests.report.kernel32 + Finally, note that while the error directives are inherited by subcategories, they are not merged. So if if both win and win32 have error-matching directives, win32 will not inherit anything from the win category. -- 2.20.1

1 0

[tools] testbot/TestWTBS: Fix matching regexps in patches.
by Francois Gouget March 1, 2021

March 1, 2021

That step was getting skipped for patches submitted through the mailing list, i.e. whenever CheckJobTree() was first called from CheckPatch() (which checks the patches/* files) rather than straight from CheckJobs(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Sending the 100+ wtbsuite test cases is normally done through WinePatches*Submit.pl, that is as if coming from the mailing list, resulting in that check being skipped. Found thanks to the testwtbsuite test suite. --- testbot/tests/TestWTBS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 6a19f138b..daeb36eaa 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1126,10 +1126,6 @@ sub CheckJobTree($;$) $TestInfo = LoadTestInfo($Step->GetFullFileName()); return if (!$TestInfo); - if ($TestInfo->{patch}) - { - GrepFile($Job->Id, $Job->GetDir(), "patch.diff", $TestInfo->{patch}); - } } my $TaskType = $Step->Type eq "build" ? "build" : @@ -1164,6 +1160,10 @@ sub CheckJobTree($;$) } } } + if ($TestInfo->{patch}) + { + GrepFile($Job->Id, $Job->GetDir(), "patch.diff", $TestInfo->{patch}); + } if ($Email->{HasFailedEmail}) { foreach my $VMName (sort keys %FailedVMs) -- 2.20.1

1 0