November 2022 - Wine-Commits

Rémi Bernon : dwrite: Avoid memcpy source overflow in GetFontAxisValues.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 0908161bbde1a0bce914f076ffd0358b90e4543b URL: https://gitlab.winehq.org/wine/wine/-/commit/0908161bbde1a0bce914f076ffd035… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 17 01:00:46 2022 +0100 dwrite: Avoid memcpy source overflow in GetFontAxisValues. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d2d2b7963f7..5e1fb1c8cbf 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7039,7 +7039,7 @@ static HRESULT WINAPI fontfacereference1_GetFontAxisValues(IDWriteFontFaceRefere if (value_count < reference->axis_values_count) return E_NOT_SUFFICIENT_BUFFER; - memcpy(axis_values, reference->axis_values, value_count * sizeof(*axis_values)); + memcpy(axis_values, reference->axis_values, reference->axis_values_count * sizeof(*axis_values)); return S_OK; }

1 0

Eric Pouech : comctl32/tests: Fix monthcal selection tests.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 190fbc750094bb88a20a70d3f28cd91b77790b62 URL: https://gitlab.winehq.org/wine/wine/-/commit/190fbc750094bb88a20a70d3f28cd9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Nov 17 12:27:50 2022 +0100 comctl32/tests: Fix monthcal selection tests. Changed MCHITTESTINFO.cbSize to fall back to V1: From the rest of the tests, it looks like the extended size of MCHITTESTINFO requires loading common controls V6, which is only done afterwards in the tests. Improved lookup of an unselected day. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50097 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comctl32/tests/monthcal.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index fcafb790302..8b01173e86e 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -2021,7 +2021,7 @@ static void test_sel_notify(void) HWND hwnd; RECT rc; - MCHITTESTINFO mchit = {sizeof(MCHITTESTINFO)}; + MCHITTESTINFO mchit = {MCHITTESTINFO_V1_SIZE}; SYSTEMTIME st; Monthcal_style styles[] = { {MCS_NOTODAY, "MCS_NOTODAY"}, @@ -2039,15 +2039,19 @@ static void test_sel_notify(void) MoveWindow(hwnd, 0, 0, rc.right, rc.bottom, FALSE); /* Simulate mouse click on some unselected day to generate MCN_SELECT and MCN_SELCHANGE notifications */ - mchit.pt.x = rc.right / 2; - mchit.pt.y = rc.bottom / 2; - SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + mchit.pt.x = mchit.pt.y = 0; SendMessageA(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st); - while(st.wDay == mchit.st.wDay) /* Ensure that mchit.pt points to unselected day */ + + do { - mchit.pt.y++; + /* we assume box for day is larger than 3x3 */ + if ((mchit.pt.y += 3) >= rc.bottom) + { + mchit.pt.y = 0; + if ((mchit.pt.x += 3) >= rc.right) break; + } SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); - } + } while (mchit.uHit != MCHT_CALENDARDATE || st.wDay == mchit.st.wDay); /* Ensure that mchit.pt points to unselected day */ got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); if (styles[i].val & MCS_MULTISELECT)

1 0

Alex Henrie : secur32: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 5f981c37e70d9e48532e16ec4f062d6c1f91be96 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f981c37e70d9e48532e16ec4f062d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 19:34:15 2022 -0700 secur32: Use the wcsdup function instead of reimplementing it. --- dlls/secur32/secur32.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index b14fc0e05b7..4875ce85651 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -174,13 +174,6 @@ PSecurityFunctionTableW WINAPI InitSecurityInterfaceW(void) return &securityFunctionTableW; } -static WCHAR *strdupW( const WCHAR *str ) -{ - WCHAR *ret = NULL; - if (str && (ret = malloc( (wcslen(str) + 1) * sizeof(WCHAR) ))) wcscpy( ret, str ); - return ret; -} - static void _makeFnTableA(PSecurityFunctionTableA fnTableA, const SecurityFunctionTableA *inFnTableA, const SecurityFunctionTableW *inFnTableW) @@ -345,8 +338,8 @@ static void _copyPackageInfo(PSecPkgInfoW info, const SecPkgInfoA *inInfoA, memcpy(info, inInfoW ? inInfoW : (const SecPkgInfoW *)inInfoA, sizeof(*info)); if (inInfoW) { - info->Name = strdupW(inInfoW->Name); - info->Comment = strdupW(inInfoW->Comment); + info->Name = wcsdup(inInfoW->Name); + info->Comment = wcsdup(inInfoW->Comment); } else { @@ -385,14 +378,14 @@ SecureProvider *SECUR32_addProvider(const SecurityFunctionTableA *fnTableA, if (fnTableA || fnTableW) { - ret->moduleName = moduleName ? strdupW(moduleName) : NULL; + ret->moduleName = wcsdup(moduleName); _makeFnTableA(&ret->fnTableA, fnTableA, fnTableW); _makeFnTableW(&ret->fnTableW, fnTableA, fnTableW); ret->loaded = !moduleName; } else { - ret->moduleName = strdupW(moduleName); + ret->moduleName = wcsdup(moduleName); ret->loaded = FALSE; }

1 0

Alex Henrie : winhttp: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: ebe6e7473056deb1fda9de6d700e13c52ccffce0 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebe6e7473056deb1fda9de6d700e13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 19:39:16 2022 -0700 winhttp: Use the wcsdup function instead of reimplementing it. --- dlls/winhttp/cookie.c | 8 ++++---- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 26 +++++++++++++------------- dlls/winhttp/session.c | 20 ++++++++++---------- dlls/winhttp/winhttp_private.h | 10 ---------- 5 files changed, 28 insertions(+), 38 deletions(-)

1 0

Alex Henrie : wldap32: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 7f5a71892691b6c4cb87a37fa6bfb860c8af4dc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f5a71892691b6c4cb87a37fa6bfb8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 19:40:29 2022 -0700 wldap32: Use the wcsdup function instead of reimplementing it. --- dlls/wldap32/control.c | 2 +- dlls/wldap32/page.c | 4 ++-- dlls/wldap32/winldap_private.h | 12 ++---------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index 746ef6049ce..ba1cefe9a45 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -215,7 +215,7 @@ ULONG CDECL ldap_encode_sort_controlW( LDAP *ld, LDAPSortKeyW **sortkeys, LDAPCo if ((result = ldap_create_sort_controlW( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS) { - ret->ldctl_oid = strdupW(control->ldctl_oid); + ret->ldctl_oid = wcsdup( control->ldctl_oid ); bv_val_dup( &control->ldctl_value, &ret->ldctl_value ); ret->ldctl_iscritical = control->ldctl_iscritical; ldap_control_freeW( control ); diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 7e066015d7e..64972b9829f 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -297,8 +297,8 @@ LDAPSearch * CDECL ldap_search_init_pageW( LDAP *ld, WCHAR *dn, ULONG scope, WCH return NULL; } - if (dn && !(search->dn = strdupW( dn ))) goto fail; - if (filter && !(search->filter = strdupW( filter ))) goto fail; + if (dn && !(search->dn = wcsdup( dn ))) goto fail; + if (filter && !(search->filter = wcsdup( filter ))) goto fail; if (attrs && !(search->attrs = strarraydupW( attrs ))) goto fail; len = serverctrls ? controlarraylenW( serverctrls ) : 0; diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 49114dcf4ba..886c7933e9f 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -542,14 +542,6 @@ static inline char *strdupU( const char *src ) return dst; } -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if ((dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); - return dst; -} - static inline char *strWtoU( const WCHAR *str ) { char *ret = NULL; @@ -652,7 +644,7 @@ static inline WCHAR **strarraydupW( WCHAR **strarray ) { WCHAR **p = strarray, **q = ret; - while (*p) *q++ = strdupW( *p++ ); + while (*p) *q++ = wcsdup( *p++ ); *q = NULL; } } @@ -1225,7 +1217,7 @@ static inline LDAPControlW *controldupW( LDAPControlW *control ) return NULL; } - ret->ldctl_oid = strdupW( control->ldctl_oid ); + ret->ldctl_oid = wcsdup( control->ldctl_oid ); ret->ldctl_value.bv_len = len; ret->ldctl_value.bv_val = val; ret->ldctl_iscritical = control->ldctl_iscritical;

1 0

Francois Gouget : testbot: Highlight the "wait timed out in thread" critical section errors.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: tools Branch: master Commit: 86aedb9aae7819f503c919eb4798c629c060cf15 URL: https://gitlab.winehq.org/winehq/tools/-/commit/86aedb9aae7819f503c919eb479… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 19 16:25:47 2019 +0100 testbot: Highlight the "wait timed out in thread" critical section errors. The tests should not be triggering any such errors. --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 585b1d04..241eda46 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -141,6 +141,12 @@ sub GetLogLineCategory($) } return "error"; } + if ($Line =~ /^[0-9a-f]+:err:ntdll:RtlpWaitForCriticalSection/) + { + # The tests should not have "wait timed out in thread" critical section + # errors. + return "error"; + } if (# TestBot script error messages $Line =~ /^[a-zA-Z.]+:error: / or # TestBot error

1 0

Francois Gouget : testbot/LibvirtTool: Re-set the locale and country when preparing Windows VMs.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: tools Branch: master Commit: ba9cb31d7418e896a8fc95f4cbc4af312631e197 URL: https://gitlab.winehq.org/winehq/tools/-/commit/ba9cb31d7418e896a8fc95f4cbc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 18 12:56:38 2022 +0100 testbot/LibvirtTool: Re-set the locale and country when preparing Windows VMs. On Windows a call to SetSystemTime() reverts UserDefaultLCID and ThreadLocale to their pre-SetWinLocale values. But only if the time is 24 hours after SetWinLocale was run!!! Setting the locale is normally done when preparing the VM's live snapshot (some of the locale settings require a reboot) so part of the locale settings are lost if the snapshot is used more than 24 hours later. Fortunately the lost settings take don't require a reboot to take effect so re-set without rebooting right before using the VM to work around this issue. --- testbot/bin/LibvirtTool.pl | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 0c070da6..60559ebd 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -588,9 +588,9 @@ sub ResetBootCount($) $TA->SetProperty("start.count", 0); } -sub PrepareVM($) +sub PrepareVM($$) { - my ($TA) = @_; + my ($TA, $Config) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -611,6 +611,22 @@ sub PrepareVM($) { FatalError("Setting the $VMKey system time failed: ". $PTA->GetLastError() ."\n"); } + + if ($VM->Type =~ /^win(?:32|64)$/ and $Config->{locale}) + { + # Moving the time forward by more than 24 hours reverts UserDefaultLCID and + # ThreadLocale to their pre-SetWinLocale values!!! So restore the locale. + my $Country = $Config->{locale}; + $Country =~ s/^.*-//; + my @Cmd = ("$BinDir/SetWinLocale", "--vm", $VMKey, "--locale", $Config->{locale}, "--country", $Country, "--no-reboot"); + $TA->Disconnect(); + + Debug("Running: @Cmd\n"); + if (system(@Cmd)) + { + FatalError("Could not restore the $VMKey locale to $Config->{locale}\n"); + } + } } sub GetSnapshotConfig($$) @@ -885,6 +901,11 @@ sub Revert() $VM->ChildDeadline($Deadline + $ExtraTimeout); $VM->Save(); } + else + { + GetSnapshotConfig($Domain, $Config); + $Config->{base} = $VM->IdleSnapshot; + } # Before reverting, try to perform a clean shutdown if requested. # After a shutdown a small wait is also sometimes required, at least when @@ -924,7 +945,7 @@ sub Revert() my $TA = $VM->GetAgent(); WaitForBoot($TA) if ($Booting); - PrepareVM($TA); + PrepareVM($TA, $Config); if ($Config->{create}) {

1 0

Francois Gouget : testbot: Put child processes in their own process group and kill the group.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: tools Branch: master Commit: fbe2ece2c2bc8cea8d543af4ccddea2d95ef2256 URL: https://gitlab.winehq.org/winehq/tools/-/commit/fbe2ece2c2bc8cea8d543af4ccd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 18 19:40:10 2022 +0100 testbot: Put child processes in their own process group and kill the group. Some child processes start processes of their own. In particular LibvirtTool runs SetWineLocale and Net::OpenSSH starts ssh processes behind the scenes. Those could linger when the child process times out and, in particular, the ssh processes could keep maintain network connections to the host used for ssh tunneling. So make sure that when a child process must be killed the whole subprocess tree is terminated too. --- testbot/lib/WineTestBot/VMs.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2f736c63..467f750b 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -146,6 +146,7 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); use File::Basename; +use POSIX; # setpgid() use ObjectModel::BackEnd; use WineTestBot::Config; @@ -328,7 +329,8 @@ sub KillChild($) { require WineTestBot::Log; WineTestBot::Log::LogMsg("Killing child ". $self->ChildPid ."\n"); - kill("TERM", $self->ChildPid); + # Kill the child process and all its descendants + kill("TERM", -$self->ChildPid); } $self->ChildDeadline(undef); $self->ChildPid(undef); @@ -483,6 +485,9 @@ sub Run($$$$$$) # Close the database connections CloseAllDBBackEnds(); + # Put this process and all its descendants in a new process group + setpgid(0, 0); + # Wait for the parent to set $VM->ChildPid close($fd_write); sysread($fd_read, $fd_write, 1);

1 0

Francois Gouget : testbot: Allow known regular failures to match flaky failures too.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: tools Branch: master Commit: dd8daec9a43e46d4c25a438bd29d76285cf27f13 URL: https://gitlab.winehq.org/winehq/tools/-/commit/dd8daec9a43e46d4c25a438bd29… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 14 11:56:58 2022 +0200 testbot: Allow known regular failures to match flaky failures too. This ensures a smooth transition when a failure is marked as flaky. --- testbot/lib/WineTestBot/LogUtils.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 56129e10..585b1d04 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1491,12 +1491,17 @@ sub MatchLogFailures($$) my $UnitFailures = $FailureTree{$GroupName}->{$TestUnit}; next if (!$UnitFailures); + # Allow regular expressions written for regular failures to still match + # when the test has been marked as flaky to ensure a smooth transition. + my $NonFlakyLine = $Line; + $NonFlakyLine =~ s/Test succeeded inside flaky todo block:/Test succeeded inside todo block:/g; + $NonFlakyLine =~ s/Test marked flaky:/Test failed:/g; foreach my $UnitFailure (@$UnitFailures) { my $RegExp = $UnitFailure->FailureRegExp; my $Match = eval { use warnings FATAL => qw(regexp); - $RegExp and $Line =~ /$RegExp/; + $RegExp and ($Line =~ /$RegExp/ or $NonFlakyLine =~ /$RegExp/); }; next if (!$Match);

1 0

Francois Gouget : testbot: Track which build warnings are new.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: tools Branch: master Commit: f1fe0ca977f17a1cb5a631e4d4c1c2f0c77a244f URL: https://gitlab.winehq.org/winehq/tools/-/commit/f1fe0ca977f17a1cb5a631e4d4c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 19 19:19:07 2022 +0200 testbot: Track which build warnings are new. This requires keeping the past build logs as a reference and comparing the new build logs to them. Note that because of the build parallelism the warnings may not always appear in the same order in the reference build logs so there could still be some false positives. If that happens the false positives can be avoided by tracking the warnings as known failures. Regardless, even new warnings do not cause a patch to be reported as bad. --- testbot/bin/Janitor.pl | 2 +- testbot/bin/UpdateTaskLogs | 8 ++++---- testbot/bin/WineRunBuild.pl | 6 +++++- testbot/bin/WineRunReconfig.pl | 14 +++++++++++++- testbot/bin/WineRunWineTest.pl | 6 +++++- testbot/lib/WineTestBot/LogUtils.pm | 17 ++++++++--------- 6 files changed, 36 insertions(+), 17 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 069ffb76..169bc3cb 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -347,7 +347,7 @@ if (opendir(my $dh, "$DataDir/latest")) my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() - if ($Entry !~ /^[a-zA-Z0-9_]+-job[0-9]+-[a-zA-Z0-9_]+\.report(?:\.errors)?$/) + if ($Entry !~ /^[a-zA-Z0-9_]+-job[0-9]+-[a-zA-Z0-9_]+\.(?:log|report)(?:\.errors)?$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: latest/$Entry\n"; diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index e50e449c..8a74fd7b 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -402,8 +402,6 @@ sub ProcessTaskLogs($$$$) # Take a snapshot of the reference reports older than this Task foreach my $ReportName (@{GetLogFileNames($TaskDir)}) { - next if ($ReportName !~ /\.report$/); - Debug(TaskKeyStr($Task) .": Snapshotting the reference reports for $ReportName\n"); my $ErrMessages = SnapshotLatestReport($Task, $ReportName); foreach my $ErrMessage (@$ErrMessages) @@ -456,7 +454,8 @@ sub ProcessTaskLogs($$$$) } } - if (!$OptDelete and $Task->Status eq "completed" and $Step->Type eq "suite") + if (!$OptDelete and $Task->Status eq "completed" and + ($Step->Type eq "suite" or $Step->Type eq "reconfig")) { # Update the latest reference reports # WineTest runs that timed out are missing results which would cause false @@ -468,7 +467,8 @@ sub ProcessTaskLogs($$$$) { foreach my $ReportName (@{GetLogFileNames($TaskDir)}) { - next if ($ReportName !~ /\.report$/); + next if ($Step->Type eq "suite" and $ReportName !~ /\.report$/); + next if ($Step->Type eq "reconfig" and $ReportName !~ /\.log$/); next if (-z "$TaskDir/$ReportName"); $Rc += DoUpdateLatestReport($Task, $ReportName, "$TaskDir/$ReportName"); } diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index c664a8b8..934a9aa3 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -415,6 +415,10 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log")) $TAError = $ErrMessage = undef; # ...but keep keep the task.log ones $TaskFailures = $LogInfo->{eCount}; + + # Grab a copy of the reference report + my $ErrMessages = SnapshotLatestReport($Task, "task.log"); + LogTaskError("$_\n") for (@$ErrMessages); } elsif ($LogInfo->{Task} eq "badpatch") { @@ -432,7 +436,7 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log")) # that explains why. $NewStatus = "badbuild"; } - my $LogErrMsg = CreateLogErrorsCache($LogInfo); + my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 889af4bd..90004545 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -254,6 +254,14 @@ sub WrapUpAndExit($;$$$$) $VM->Save(); } + # Update the 'latest/' reference WineTest results + # Ignore the results from failed or timed out builds. + if ($Status eq 'completed' and !$TimedOut) + { + my $ErrMessages = UpdateLatestReports($Task, ["task.log"]); + Error("$_\n") for (@$ErrMessages); + } + my $Result = $VM->Name .": ". $VM->Status ." Status: $Status Failures: ". (defined $TestFailures ? $TestFailures : "unset"); LogMsg "Task $JobId/$StepNo/$TaskNo done ($Result)\n"; Debug(Elapsed($Start), " Done. $Result\n"); @@ -417,6 +425,10 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) $TAError = $ErrMessage = undef; # ...but keep keep the task.log ones $TaskFailures = $LogInfo->{eCount}; + + # Grab a copy of the reference report + my $ErrMessages = SnapshotLatestReport($Task, "task.log"); + LogTaskError("$_\n") for (@$ErrMessages); } elsif (defined $LogInfo->{BadLog}) { @@ -435,7 +447,7 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) MakeOfficialURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; } - my $LogErrMsg = CreateLogErrorsCache($LogInfo); + my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 985fdc2a..8bc8e356 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -517,6 +517,10 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) $TAError = $ErrMessage = $PossibleCrash = undef; # Reset the timeout error but keep the task.log ones $TaskFailures = $LogInfo->{eCount}; + + # Grab a copy of the reference report + my $ErrMessages = SnapshotLatestReport($Task, "task.log"); + LogTaskError("$_\n") for (@$ErrMessages); } elsif ($LogInfo->{Task} eq "badpatch") { @@ -543,7 +547,7 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) $TaskFailures = undef; $PossibleCrash = 1; } - my $LogErrMsg = CreateLogErrorsCache($LogInfo); + my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e60dec8a..56129e10 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1585,17 +1585,16 @@ sub CreateLogErrorsCache($;$) return $LogInfo->{BadLog} if (defined $LogInfo->{BadLog}); - if ($LogInfo->{LogName} !~ /\.report$/) - { - # Only test reports have reference WineTest results. - # So for other logs all errors are new. - MarkAllMessagesAsNew($LogInfo); - } - elsif ($Task and @{$LogInfo->{MsgGroupNames}}) + if ($Task and @{$LogInfo->{MsgGroupNames}}) { TagNewMessages($LogInfo, $Task); - # Don't mark the errors as new if there is no reference WineTest report - # as this would cause false positives. + if ($LogInfo->{NoRef} and $LogInfo->{LogName} !~ /\.report$/) + { + # In the absence of a reference report, consider all non-test errors + # to be new, mostly for the benefit of build errors. + # But don't do so for test errors to avoid false positives. + MarkAllMessagesAsNew($LogInfo); + } } my $LogFailures = MatchLogFailures($LogInfo, $Task) if ($Task);

1 0