June 2022 - Wine-Commits - list.winehq.org

Hans Leidekker : cryptnet: Move revocation cache check to verify_cert_revocation_from_dist_points_ext().
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: f08dcbf894943f85485f5d34a7120d52320559fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f08dcbf894943f85485f5d34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 13:57:54 2022 +0200 cryptnet: Move revocation cache check to verify_cert_revocation_from_dist_points_ext(). Paves the way for falling back from OCSP to online CRL verification. It's not clear if a cache is needed for OCSP responses, or if the wininet cache wouldn't be sufficient. --- dlls/cryptnet/cryptnet_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index b066821a431..cd06c4a3008 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1696,6 +1696,9 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * return CRYPT_E_REVOCATION_OFFLINE; } + if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, time, status)) + return status->dwError; + if (!CRYPT_GetUrlFromCRLDistPointsExt(value, NULL, &url_array_size, NULL, NULL)) return GetLastError(); @@ -2143,9 +2146,6 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, DWORD error = ERROR_SUCCESS; PCERT_EXTENSION ext; - if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, pTime, pRevStatus)) - return pRevStatus->dwError; - if ((ext = CertFindExtension(szOID_AUTHORITY_INFO_ACCESS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { error = verify_cert_revocation_from_aia_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus);

1 0

Jactry Zeng : dwmapi: Fill rateRefresh/rateCompose and qpcRefreshPeriod of DWM_TIMING_INFO from DwmGetCompositionTimingInfo().
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 5f680a1e1cecc8a3d1e875bb3339acdec8139cd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f680a1e1cecc8a3d1e875bb… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jun 3 02:50:29 2022 -0500 dwmapi: Fill rateRefresh/rateCompose and qpcRefreshPeriod of DWM_TIMING_INFO from DwmGetCompositionTimingInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53038 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/Makefile.in | 1 + dlls/dwmapi/dwmapi_main.c | 27 ++++++++++++++++++++++++++- dlls/dwmapi/tests/Makefile.in | 2 +- dlls/dwmapi/tests/dwmapi.c | 22 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index e63dbc2ea00..37411a57608 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,4 +1,5 @@ MODULE = dwmapi.dll +IMPORTS = user32 IMPORTLIB = dwmapi EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6bb086a87d1..1fb522e389a 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -211,12 +211,28 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i return E_NOTIMPL; } +static int get_display_frequency(void) +{ + DEVMODEA mode; + + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode)) + return mode.dmDisplayFrequency; + else + { + WARN("Failed to query display frequency, returning a fallback value.\n"); + return 60; + } +} + /********************************************************************** * DwmGetCompositionTimingInfo (DWMAPI.@) */ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) { - static int i; + LARGE_INTEGER performance_frequency; + static int i, display_frequency; if (!info) return E_INVALIDARG; @@ -229,6 +245,15 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) memset(info, 0, info->cbSize); info->cbSize = sizeof(DWM_TIMING_INFO); + display_frequency = get_display_frequency(); + info->rateRefresh.uiNumerator = display_frequency; + info->rateRefresh.uiDenominator = 1; + info->rateCompose.uiNumerator = display_frequency; + info->rateCompose.uiDenominator = 1; + + QueryPerformanceFrequency(&performance_frequency); + info->qpcRefreshPeriod = performance_frequency.QuadPart / display_frequency; + return S_OK; } diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in index 6c6130401d6..e819e3ca09a 100644 --- a/dlls/dwmapi/tests/Makefile.in +++ b/dlls/dwmapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dwmapi.dll -IMPORTS = dwmapi +IMPORTS = dwmapi user32 C_SRCS = \ dwmapi.c diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c index 696aa9c9d86..29dbcbe74bd 100644 --- a/dlls/dwmapi/tests/dwmapi.c +++ b/dlls/dwmapi/tests/dwmapi.c @@ -35,7 +35,11 @@ static void test_DwmIsCompositionEnabled(void) static void test_DwmGetCompositionTimingInfo(void) { + LARGE_INTEGER performance_frequency; + int result, display_frequency; DWM_TIMING_INFO timing_info; + QPC_TIME refresh_period; + DEVMODEA mode; BOOL enabled; HRESULT hr; @@ -56,9 +60,27 @@ static void test_DwmGetCompositionTimingInfo(void) hr = DwmGetCompositionTimingInfo(NULL, &timing_info); ok(hr == MILERR_MISMATCHED_SIZE, "Got hr %#lx.\n", hr); + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + result = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode); + ok(!!result, "Failed to get display mode %#lx.\n", GetLastError()); + display_frequency = mode.dmDisplayFrequency; + ok(!!QueryPerformanceFrequency(&performance_frequency), "Failed to get performance counter frequency.\n"); + refresh_period = performance_frequency.QuadPart / display_frequency; + timing_info.cbSize = sizeof(timing_info); hr = DwmGetCompositionTimingInfo(NULL, &timing_info); ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(timing_info.cbSize == sizeof(timing_info), "Got wrong struct size %d.\n", timing_info.cbSize); + ok(timing_info.rateRefresh.uiDenominator == 1 && timing_info.rateRefresh.uiNumerator == display_frequency, + "Got wrong monitor refresh rate %d/%d.\n", timing_info.rateRefresh.uiDenominator, + timing_info.rateRefresh.uiNumerator); + ok(timing_info.rateCompose.uiDenominator == 1 && timing_info.rateCompose.uiNumerator == display_frequency, + "Got wrong composition rate %d/%d.\n", timing_info.rateCompose.uiDenominator, + timing_info.rateCompose.uiNumerator); + ok(timing_info.qpcRefreshPeriod == refresh_period + || broken(timing_info.qpcRefreshPeriod == display_frequency), /* win10 v1507 */ + "Got wrong monitor refresh period %s.\n", wine_dbgstr_longlong(timing_info.qpcRefreshPeriod)); } START_TEST(dwmapi)

1 0

Jactry Zeng : dwmapi: Return S_OK from DwmFlush().
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: f397807415b4807aeabac7243a13a15599008ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f397807415b4807aeabac724… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jun 3 02:50:30 2022 -0500 dwmapi: Return S_OK from DwmFlush(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 1fb522e389a..1a65410c7eb 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -92,7 +92,7 @@ HRESULT WINAPI DwmFlush(void) if (!once++) FIXME("() stub\n"); - return E_NOTIMPL; + return S_OK; } /**********************************************************************

1 0

Francois Gouget : testbot/UpdateFailures: Add a script to refresh the failures' bug information.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: tools Branch: master Commit: 603e161126b439310eb39850860a89d8e22239cc URL: https://source.winehq.org/git/tools.git/?a=commit;h=603e161126b439310eb3985… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 15 18:21:55 2022 +0200 testbot/UpdateFailures: Add a script to refresh the failures' bug information. This queries Bugzilla to update the failure bug status and description fields. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateFailures.pl | 192 ++++++++++++++++++++++++++++++++++++++++++ testbot/doc/INSTALL.txt | 5 ++ 2 files changed, 197 insertions(+) diff --git a/testbot/bin/UpdateFailures.pl b/testbot/bin/UpdateFailures.pl new file mode 100755 index 00000000..7c89b7b9 --- /dev/null +++ b/testbot/bin/UpdateFailures.pl @@ -0,0 +1,192 @@ +#!/usr/bin/perl -Tw +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# +# This script updates the failures bug information. +# +# Copyright 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } +} +my $Name0 = $0; +$Name0 =~ s+^.*/++; + +my $WineBugUrl = "https://bugs.winehq.org/"; + +use Text::CSV::Encoded; + +use ObjectModel::Collection; +use WineTestBot::Failures; +use WineTestBot::Log; + + +# +# Logging and error handling helpers +# + +my $Debug; +sub Debug(@) +{ + print STDERR @_ if ($Debug); +} + +my $LogOnly; +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + +# +# Bugzilla interface +# + +sub CollectBugInfo($) +{ + my ($BugIds) = @_; + + my $Bugs = {}; + my $Cmd = "wget -qO- '$WineBugUrl/buglist.cgi?bug_id=". join(",", @$BugIds) + ."&columnlist=bug_status,resolution,short_desc&ctype=csv'"; + if (open(my $Fh, "-|", $Cmd)) + { + <$Fh>; # skip the header line + + my $Csv = Text::CSV::Encoded->new({ binary => 1 }); + while (my $Line = <$Fh>) + { + if ($Csv->parse($Line)) + { + my ($BugId, $Status, $Resolution, $Description) = $Csv->fields(); + $Bugs->{$BugId} = { + Status => $Status, + Resolution => $Resolution, + Description => $Description, + }; + Debug("Bug $BugId - $Status - $Resolution - $Description\n"); + } + else + { + Error("could not parse line: ", $Csv->error_input, "\n"); + } + } + close($Fh); + } + return $Bugs; +} + + +# +# Main +# + +my (@FailureIds, $Usage); +while (@ARGV) +{ + my $Arg = shift @ARGV; + if ($Arg eq "--log-only") + { + $LogOnly = 1; + } + elsif ($Arg eq "--debug") + { + $Debug = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + elsif ($Arg =~ /^([0-9]+)$/) + { + push @FailureIds, $1; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } +} +# Check parameters +if (defined $Usage) +{ + print "Usage: $Name0 [--log-only] [--debug] [--help] [FID...]\n"; + exit $Usage; +} + +my $Failures = CreateFailures(); +(a)FailureIds = @{$Failures->GetKeys()} if (!@FailureIds); +(a)FailureIds = sort { $a <=> $b } @FailureIds; + +# Deduplicate the bug ids +my $BugIds; +foreach my $FailureId (@FailureIds) +{ + my $Failure = $Failures->GetItem($FailureId); + $BugIds->{$Failure->BugId} = 1; +} + +# Update the failures bug information +my $Bugs = CollectBugInfo([keys %$BugIds]); +foreach my $FailureId (@FailureIds) +{ + my $Failure = $Failures->GetItem($FailureId); + my $Bug = $Bugs->{$Failure->BugId}; + if ($Bug) + { + if ($Failure->BugStatus ne "deleted") + { + my $Resolution = $Bug->{Resolution} || " ---"; + $Resolution = $Resolution eq " ---" ? "" : " $Resolution"; + $Failure->BugStatus("$Bug->{Status}$Resolution"); + } + $Failure->BugDescription($Bug->{Description}); + } + else + { + $Failure->BugStatus("Does not exist"); + $Failure->BugDescription("The WineHQ bug ". $Failure->BugId ." does not exist!"); + } + if ($Debug and $Failure->GetIsModified()) + { + Debug("Failure $FailureId - ", $Failure->BugStatus, " - ", $Failure->BugDescription, "\n"); + } +} + +my ($ErrKey, $ErrProperty, $ErrMessage) = $Failures->Save(); +if ($ErrMessage) +{ + Error("Could not save $ErrKey because of the $ErrProperty field: $ErrMessage\n"); + exit 1; +} + +exit 0; diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 46edeea5..fac4580b 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -81,6 +81,11 @@ Setup for Winetest updates: instance: */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl --log-only +Setup for failure bug information updates: +- Use a cron job to run UpdateFailures.pl periodically. For + instance: + 0 */4 * * * $HOME/tools/testbot/bin/UpdateFailures.pl --log-only + Setup for wine-devel: - A proper WineTestBot system should integrate with Wine's patches site. An alternative is to interface directly with wine-devel as described in

1 0

Francois Gouget : testbot/WineSendLog: Take into account the known failures.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: tools Branch: master Commit: 2ea0ffd802cf42f073296baf5bd76fea778c74c2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2ea0ffd802cf42f073296ba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 15 18:21:51 2022 +0200 testbot/WineSendLog: Take into account the known failures. Don't count known failures as new failures, in particular when updating the patches site. Add links to the WineHQ bugs for known failures found in the logs. And identify the bug each known failure line corresponds to. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 78 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 24 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 3897ac03..a2f2369b 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -44,6 +44,7 @@ $Name0 =~ s+^.*/++; use Algorithm::Diff; use WineTestBot::Config; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::LogUtils; @@ -177,10 +178,11 @@ sub SendLog($) # Collect and count the new and old failures, etc. # - my (@New, $JobInfo); - my ($NewCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0); + my ($JobInfo, @New, %BugDescriptions); + my ($NewCount, $FailCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0, 0); my $FileType = "test executable"; + my $Failures = CreateFailures($Job); my $StepsTasks = CreateStepsTasks(undef, $Job); my $SortedStepsTasks = $StepsTasks->GetSortedItems(); foreach my $StepTask (@$SortedStepsTasks) @@ -193,12 +195,13 @@ sub SendLog($) my $TaskDir = $StepTask->GetTaskDir(); my $LogNames = GetLogFileNames($TaskDir); - $JobInfo->{$StepTask->Id}->{LogNames} = $LogNames; - $JobInfo->{$StepTask->Id}->{NewCount} = 0; - $JobInfo->{$StepTask->Id}->{OldCount} = 0; + my $TaskInfo = $JobInfo->{$StepTask->Id} = {}; + $TaskInfo->{LogNames} = $LogNames; + $TaskInfo->{NewCount} = 0; + $TaskInfo->{OldCount} = 0; if ($StepTask->Status eq "boterror") { - $JobInfo->{$StepTask->Id}->{BotCount} = 1; + $TaskInfo->{BotCount} = 1; $BotCount++; } $FileType = "patch" if ($StepTask->FileType eq "patch"); @@ -207,7 +210,7 @@ sub SendLog($) { my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); next if (!defined $LogInfo->{BadLog} and !$LogInfo->{ErrCount}); - $JobInfo->{$StepTask->Id}->{$LogName} = $LogInfo; + $TaskInfo->{$LogName} = $LogInfo; my $HasLogHeader; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) @@ -216,7 +219,21 @@ sub SendLog($) my $Group = $LogInfo->{ErrGroups}->{$GroupName}; foreach my $ErrIndex (0..$#{$Group->{Errors}}) { - if ($Group->{IsNew}->[$ErrIndex]) + my $LineNo = $Group->{LineNos}->[$ErrIndex]; + my $LineFailureIds = $Group->{Failures}->{$ErrIndex}; + if ($LineFailureIds) + { + foreach my $FailureId (@$LineFailureIds) + { + my $Failure = $Failures->GetItem($FailureId); + next if (!$Failure); + $BugDescriptions{$Failure->BugId} = $Failure->BugDescription; + # Add bug information to $LogInfo + push @{$LogInfo->{Bugs}->{$LineNo}}, $Failure->BugId; + } + $TaskInfo->{OldCount}++; + } + elsif ($Group->{IsNew}->[$ErrIndex]) { if (!$HasLogHeader) { @@ -229,16 +246,16 @@ sub SendLog($) $HasGroupHeader = 1; } push @New, "$Group->{Errors}->[$ErrIndex]\n"; - $JobInfo->{$StepTask->Id}->{NewCount}++; + $TaskInfo->{NewCount}++; } else { - $JobInfo->{$StepTask->Id}->{OldCount}++; + $TaskInfo->{OldCount}++; } } } - $NewCount += $JobInfo->{$StepTask->Id}->{NewCount}; - $OldCount += $JobInfo->{$StepTask->Id}->{OldCount}; + $NewCount += $TaskInfo->{NewCount}; + $OldCount += $TaskInfo->{OldCount}; } } @@ -281,10 +298,9 @@ sub SendLog($) { print $Sendmail <<"EOF"; It looks like your $FileType introduces some new failures. Please -investigate and fix them if they are indeed new. Note that rare -failures and failures with always changing text (e.g. because of memory -addresses) can cause false positives. If this is what happened, then -fixing those would really help. +investigate and fix them if they are indeed new. If they are not new, +fixing them anyway would help a lot. Otherwise please ask for the known +failures list to be updated. EOF } @@ -309,10 +325,21 @@ EOF if ($OldCount) { print $Sendmail <<"EOF"; -Some preexisting failures (not caused by your $FileType) happened. +There are some preexisting failures (not caused by your $FileType). If you know how to fix them that would be helpful. - EOF + if (%BugDescriptions) + { + print $Sendmail <<"EOF"; +In particular some failures are tracked in the bug(s) below: +EOF + foreach my $BugId (sort { $a <=> $b } keys %BugDescriptions) + { + print $Sendmail "* $BugId - $BugDescriptions{$BugId}\n"; + print $Sendmail " $WineBugUrl$BugId\n"; + } + print $Sendmail "\n"; + } } print $Sendmail " Failures\n"; @@ -360,7 +387,7 @@ EOF my $TaskDir = $StepTask->GetTaskDir(); foreach my $LogName (@{$TaskInfo->{LogNames}}) { - my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); + my $LogInfo = $TaskInfo->{$LogName}; next if (!defined $LogInfo->{BadLog} and !$LogInfo->{ErrCount}); print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; @@ -372,7 +399,11 @@ EOF my $Group = $LogInfo->{ErrGroups}->{$GroupName}; foreach my $ErrIndex (0..$#{$Group->{Errors}}) { - my $Prefix = $Group->{IsNew}->[$ErrIndex] ? "new" : "old"; + my $LineNo = $Group->{LineNos}->[$ErrIndex]; + my $Bugs = $LogInfo->{Bugs}->{$LineNo}; + my $Prefix = $Bugs ? join(" ", sort { $a <=> $b } @$Bugs) : + $Group->{IsNew}->[$ErrIndex] ? "new" : + "old"; print $Sendmail "[$Prefix] $Group->{Errors}->[$ErrIndex]\n"; } } @@ -433,10 +464,9 @@ EOF { print $Sendmail <<"EOF"; It looks like your $FileType introduced the new failures shown below. -Please investigate and fix them if they are indeed new. Note that rare -failures and failures with always changing text (e.g. because of memory -addresses) can cause false positives. If this is what happened, then -fixing those would really help. +Please investigate and fix them before resubmitting your $FileType. +If they are not new, fixing them anyway would help a lot. Otherwise +please ask for the known failures list to be updated. EOF }

1 0

Francois Gouget : testbot: Match the failures with the test logs.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: tools Branch: master Commit: 1b238d27711cf9b62fb5f304d19610c0472c7b05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1b238d27711cf9b62fb5f30… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 15 18:21:35 2022 +0200 testbot: Match the failures with the test logs. This augments the .errors files with information mapping errors to known failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 180 +++++++++++++++++++++++++++++++++++- 1 file changed, 178 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2e3de83b..b8aaaa43 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -36,7 +36,10 @@ our @EXPORT = qw(GetLogFileNames GetLogLabel use Algorithm::Diff; use File::Basename; +use ObjectModel::Collection; # For CombineKey() use WineTestBot::Config; # For $MaxUnitSize +use WineTestBot::Failures; +use WineTestBot::Tasks; # FIXME Hack for SaveLogFailures() use WineTestBot::Utils; # For LocaleName() @@ -187,6 +190,12 @@ sub _AddLogError($$$;$$) Returns a hashtable containing a summary of the task log: =over +=item LogName +The log file basename. + +=item LogPath +The full log file path. + =item Type 'tests' if the task ran Wine tests and 'build' otherwise. @@ -913,6 +922,10 @@ copy of that line (with CR/LF converted to a simple LF). The format for new error lines is identical to that for old errors but with a different type. +=item f <errindex> <failureid1>... +Failure lines contain the index of the error in the error group and a list of +the known failures they match (normally at most one). + =back =back =cut @@ -981,6 +994,10 @@ sub LoadLogErrorsFromFh($$) { _AddLogError($LogInfo, $LogInfo->{CurGroup}, $Value, $Property, "new"); } + elsif ($Type eq "f") + { + $LogInfo->{CurGroup}->{Failures}->{$Property} = [ split / /, $Value ]; + } else { $LogInfo->{BadLog} = "$LogInfo->{LineNo}: Found an unknown line type ($Type)"; @@ -1058,8 +1075,12 @@ sub _WriteLogErrorsToFh($$) print $Fh "g $Group->{LineNo} $GroupName\n"; foreach my $Index (0..$#{$Group->{Errors}}) { + my $LineNo = $Group->{LineNos}->[$Index]; my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; - print $Fh "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; + print $Fh "$IsNew $LineNo $Group->{Errors}->[$Index]\n"; + + my $Failures = $Group->{Failures}->{$Index}; + print $Fh "f $Index @$Failures\n" if ($Failures); } } } @@ -1299,6 +1320,158 @@ sub TagNewErrors($$) } } +=pod +=over 12 + +=item C<MatchLogFailures()> + +Checks the errors against known failures. + +The $LogInfo structure is augmented with the following fields: +=over + +=item ErrGroups +=over + +=item Failures +A hashtable mapping error indices to the list of matching known +failure ids. + +=back +=back + +Returns a hashtable containing a summary of the log failures: +=over + +=item LogName +The log file basename. + +=item Collection +A collection containing the relevant Failure objects. + +=item Failures +A hashtable indexed by the failure ids. Each entry contains: + +=over + +=item Failure +The failure object. + +=item NewCount +A count errors matched by this known failure that were tagged as new. + +=item OldCount +A count errors matched by this known failure that were tagged as old. + +=back + +=back +=back +=cut + +sub MatchLogFailures($$) +{ + my ($LogInfo, $Task) = @_; + + my $LogFailures = { + Task => $Task, + LogName => $LogInfo->{LogName} + }; + return $LogFailures if (!$LogInfo->{ErrCount}); + + my %FailureTree; + my $ConfigName = $Task->VMName .":$LogInfo->{LogName}"; + + $LogFailures->{Collection} = CreateFailures(); + foreach my $Failure (@{$LogFailures->{Collection}->GetItems()}) + { + # Ignore failures that don't apply to this configuration + my $ConfigRegExp = $Failure->ConfigRegExp; + my $Match = eval { $ConfigRegExp and $ConfigName =~ /$ConfigRegExp/ }; + next if (!$Match); + + my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= []; + push @$UnitFailures, $Failure; + } + + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + next if (!$FailureTree{$GroupName}); + + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + foreach my $ErrIndex (0..$#{$Group->{Errors}}) + { + my $Line = $Group->{Errors}->[$ErrIndex]; + my $TestUnit = $Line =~ /^([_a-z0-9]+)\.c:\d+:/ ? $1 : ""; + my $UnitFailures = $FailureTree{$GroupName}->{$TestUnit}; + next if (!$UnitFailures); + + foreach my $UnitFailure (@$UnitFailures) + { + my $RegExp = $UnitFailure->FailureRegExp; + my $Match = eval { $RegExp and $Line =~ /$RegExp/ }; + next if (!$Match); + + my $LineFailures = $Group->{Failures}->{$ErrIndex} ||= []; + push @$LineFailures, $UnitFailure->Id; + + my $LogFailure = $LogFailures->{Failures}->{$UnitFailure->Id}; + if (!$LogFailure) + { + $LogFailure = $LogFailures->{Failures}->{$UnitFailure->Id} = + { Failure => $UnitFailure }; + } + my $Count = $Group->{IsNew}->[$ErrIndex] ? "NewCount" : "OldCount"; + $LogFailure->{$Count}++; + } + } + } + + return $LogFailures; +} + +=pod +=over 12 + +=item C<SaveLogFailures()> + +Updates the TaskFailures objects for the task and log specified by the +$LogFailures structure. + +Note that this implies deleting any preexisting TaskFailure to avoid leaving +obsolete data. + +=back +=cut + +sub SaveLogFailures($) +{ + my ($LogFailures) = @_; + + # FIXME $Task->Failures->AddFilter() cannot be undone and impacts every + # future use of $Task->Failures. So add the filter on a throw away + # clone to not end up with a nonsensical filter. + my $TaskFailures = $LogFailures->{Task}->Failures->Clone(); + $TaskFailures->AddFilter("TaskLog", [$LogFailures->{LogName}]); + my $ErrMessage = $TaskFailures->DeleteAll(); + return $ErrMessage if (defined $ErrMessage); + return undef if (!$LogFailures->{Failures}); + + foreach my $LogFailure (values %{$LogFailures->{Failures}}) + { + my $TaskFailure = $LogFailure->{Failure}->TaskFailures->Add(); + my $OldKey = $TaskFailure->GetKey(); + $TaskFailure->Task($LogFailures->{Task}); + $TaskFailure->TaskLog($LogFailures->{LogName}); + $TaskFailure->KeyChanged($OldKey, $TaskFailure->GetKey()); + $TaskFailure->NewCount($LogFailure->{NewCount}); + $TaskFailure->OldCount($LogFailure->{OldCount}); + } + + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $LogFailures->{Collection}->Save(); + return $ErrMessage; +} + # # Log errors caching [Part 2] @@ -1322,8 +1495,11 @@ sub CreateLogErrorsCache($;$) # Don't mark the errors as new if there is no reference WineTest report # as this would cause false positives. } + my $LogFailures = MatchLogFailures($LogInfo, $Task) if ($Task); - return _SaveLogErrors($LogInfo); + my $ErrMessage = _SaveLogErrors($LogInfo); + $ErrMessage ||= SaveLogFailures($LogFailures) if ($Task); + return $ErrMessage; }

1 0

Francois Gouget : testbot: Add tables to track the test failures.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: tools Branch: master Commit: a6d0511843377f462013a28288abc357f30f7e4f URL: https://source.winehq.org/git/tools.git/?a=commit;h=a6d0511843377f462013a28… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 15 18:21:28 2022 +0200 testbot: Add tables to track the test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update47.sql | 33 ++ testbot/ddl/winetestbot.sql | 32 ++ testbot/doc/winetestbot-schema.dia | 852 ++++++++++++++++++++++++++++---- testbot/lib/WineTestBot/Failures.pm | 184 +++++++ testbot/lib/WineTestBot/Jobs.pm | 6 + testbot/lib/WineTestBot/TaskFailures.pm | 120 +++++ testbot/lib/WineTestBot/Tasks.pm | 4 + 7 files changed, 1142 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=a6d0511843377f46201…

1 0

Alexandre Julliard : winetest: Wait for head commit to stabilize before building test binaries.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: tools Branch: master Commit: d98b57601dcba3c7eb571e9eb0262e5c3d97ef6f URL: https://source.winehq.org/git/tools.git/?a=commit;h=d98b57601dcba3c7eb571e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 15 12:20:07 2022 +0200 winetest: Wait for head commit to stabilize before building test binaries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/make-winetest | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index 370698ac..a16b06ba 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -47,8 +47,6 @@ done destdir="/home/winehq/opt/winetest/builds" desturl="http://test.winehq.org/builds" servicedir="/home/winehq/opt/winetest/winehq-builds/winetest" -toolsdir="/home/winehq/opt/tools" -transldir="/home/winehq/opt/source/transl" logfile=LOG @@ -64,13 +62,15 @@ umask 022 set -e (cd wine && git pull) || exit head=$(cd wine && git rev-parse --short=12 HEAD) || exit - branch=$(cd wine && git symbolic-ref HEAD) || exit - if [ $branch != refs/heads/master ] + if [ -f $destdir/winetest-$head.exe -a -f $destdir/winetest64-$head.exe -a $force -eq 0 ] then exit 0 fi - if [ -f $destdir/winetest-$head.exe -a -f $destdir/winetest64-$head.exe -a $force -eq 0 ] + + prev_head=$(cd wine && git rev-parse --short=12 PREV-HEAD) + (cd wine && git tag -f PREV-HEAD $head) + if [ "$head" != "$prev_head" -a $force -eq 0 ] then exit 0 fi

1 0

Francois Gouget : testbot/web: Add pages to add, edit and show known failures.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: tools Branch: master Commit: 0d43ade150f348b4dbd8bccf7fea0c877ae9be01 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d43ade150f348b4dbd8bcc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 15 18:21:32 2022 +0200 testbot/web: Add pages to add, edit and show known failures. The pages allow everyone to see the known failures. But only TestBot administrators can create and modify them. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/lib/WineTestBot/Config.pm | 6 +- testbot/web/FailureDetails.pl | 119 ++++++++++++++++++++++++ testbot/web/FailuresList.pl | 160 ++++++++++++++++++++++++++++++++ testbot/web/WineTestBot.css | 3 + 5 files changed, 287 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=0d43ade150f348b4dbd…

1 0

Francois Gouget : testbot/web: Link job details to the related known failures.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: tools Branch: master Commit: a72bd4055286db3fffe4030721c6ea444308ef0a URL: https://source.winehq.org/git/tools.git/?a=commit;h=a72bd4055286db3fffe4030… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 15 18:21:43 2022 +0200 testbot/web: Link job details to the related known failures. When a log contains a known failure, link it to the corresponding failure details page(s). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 54 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7860a4c9..efdd4d9b 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -237,6 +237,7 @@ our @ISA = qw(ObjectModel::CGI::CollectionPage); use URI::Escape; use WineTestBot::Config; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; # For Elapsed() use WineTestBot::LogUtils; @@ -260,6 +261,7 @@ sub _initialize($$$) { $self->SetRefreshInterval(30); } + $self->{Failures} = CreateFailures(); } sub GetJob($) @@ -378,6 +380,30 @@ sub GenerateMoreInfoLink($$$$;$$) print "<div class='TaskMoreInfoLink'>$Html</div>\n"; } +sub GetFailureLink($$;$) +{ + my ($self, $Id, $Str) = @_; + + my $Failure = $self->{Failures}->GetItem($Id); + $Str ||= $Failure ? $Failure->BugId : "F$Id"; + my $Desc = $Failure->BugDescription if ($Failure); + $Desc = ": ". $self->escapeHTML($Desc) if ($Desc); + return "<a href='FailureDetails.pl?Key=$Id' title='Failure $Id$Desc'>$Str</a>"; +} + +sub GetFailureLinks($$) +{ + my ($self, $FailureIds) = @_; + + return join(" ", map { $self->GetFailureLink($_) } + sort { + my $FA = $self->{Failures}->GetItem($a); + my $FB = $self->{Failures}->GetItem($b); + return ($FA ? $FA->BugId : 0) <=> ($FB ? $FB->BugId : 0) + || $a <=> $b; + } @$FailureIds); +} + sub GenerateFullLog($$$$) { my ($self, $Dir, $LogName, $HideLog) = @_; @@ -400,14 +426,18 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my %ErrCategory; + my (%ErrCategory, %ErrFailures); foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; for my $ErrIndex (0..$#{$Group->{Errors}}) { my $LineNo = $Group->{LineNos}->[$ErrIndex]; - $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; + if ($LineNo) + { + $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; + $ErrFailures{$LineNo} = $Group->{Failures}->{$ErrIndex}; + } } } @@ -435,6 +465,11 @@ sub GenerateFullLog($$$$) { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; } + if ($ErrFailures{$LineNo}) + { + print "[", $self->GetFailureLinks($ErrFailures{$LineNo}), "] "; + $Html = $self->GetFailureLink($ErrFailures{$LineNo}->[0], $Html); + } print "$Html\n"; } close($LogFile); @@ -464,6 +499,11 @@ sub GenerateFullLog($$$$) my $Line = $Group->{Errors}->[$ErrIndex]; my $Category = $Group->{IsNew}->[$ErrIndex] ? "new" : "error"; my $Html = $self->escapeHTML($Line); + if ($Group->{Failures}->{$ErrIndex}) + { + print "[", $self->GetFailureLinks($Group->{Failures}->{$ErrIndex}), "] "; + $Html = $self->GetFailureLink($Group->{Failures}->{$ErrIndex}->[0], $Html); + } print "<span class='log-$Category'>$Html</span>\n"; } } @@ -629,14 +669,18 @@ EOF my $Group = $LogInfo->{ErrGroups}->{$GroupName}; foreach my $Line (@{$Group->{Errors}}) { + my $Html = $self->escapeHTML($Line); if ($Group->{IsNew}->[$ErrIndex]) { - print "<span class='log-new'>", $self->escapeHTML($Line), "</span>\n"; + $Html = "<span class='log-new'>$Html</span>"; } - else + my $FailureIds = $Group->{Failures}->{$ErrIndex}; + if ($FailureIds) { - print $self->escapeHTML($Line), "\n"; + print "[", $self->GetFailureLinks($FailureIds), "] "; + $Html = $self->GetFailureLink($FailureIds->[0], $Html); } + print "$Html\n"; $ErrIndex++; } print "</code></pre>\n";

1 0