October 2022 - Wine-commits

Piotr Caban : comctl32/tests: Test PROPERTYSHEETPAGE passed in WM_INITDIALOG.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 88bc45a7ec3eb4da1d5ace213003cbaca2393449 URL: https://gitlab.winehq.org/wine/wine/-/commit/88bc45a7ec3eb4da1d5ace213003cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 14:13:12 2022 +0200 comctl32/tests: Test PROPERTYSHEETPAGE passed in WM_INITDIALOG. --- dlls/comctl32/tests/propsheet.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 8b2c282c72e..2132158bd93 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -112,10 +112,18 @@ static INT_PTR CALLBACK page_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, { case WM_INITDIALOG: { + PROPSHEETPAGEA *psp = (PROPSHEETPAGEA *)lparam; HWND sheet = GetParent(hwnd); char caption[256]; + GetWindowTextA(sheet, caption, sizeof(caption)); ok(!strcmp(caption,"test caption"), "caption: %s\n", caption); + + if (psp->dwFlags & PSP_USETITLE) + { + todo_wine ok(!strcmp(psp->pszTitle, "page title"), "psp->pszTitle = %s\n", + wine_dbgstr_a(psp->pszTitle)); + } return TRUE; } @@ -149,8 +157,9 @@ static void test_title(void) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); - psp.dwFlags = 0; + psp.dwFlags = PSP_USETITLE; psp.hInstance = GetModuleHandleA(NULL); + psp.pszTitle = "page title"; U(psp).pszTemplate = "prop_page1"; U2(psp).pszIcon = NULL; psp.pfnDlgProc = page_dlg_proc;

1 0

Piotr Caban : comctl32/tests: Test passing extra data in PROPSHEETPAGE structure.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 16ac644b114ad38770fd912c8bd6513336fed2cf URL: https://gitlab.winehq.org/wine/wine/-/commit/16ac644b114ad38770fd912c8bd651… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 14:06:55 2022 +0200 comctl32/tests: Test passing extra data in PROPSHEETPAGE structure. --- dlls/comctl32/tests/propsheet.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 2132158bd93..eee525a19d3 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1035,6 +1035,7 @@ struct custom_proppage PROPSHEETPAGEA pageA; PROPSHEETPAGEW pageW; } u; + DWORD extra_data; unsigned int addref_called; unsigned int release_called; }; @@ -1050,6 +1051,12 @@ static UINT CALLBACK proppage_callback_a(HWND hwnd, UINT msg, PROPSHEETPAGEA *ps psp->lParam, psp); ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); ok(!lstrcmpA(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); + if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called)) + { + struct custom_proppage *extra_data = (struct custom_proppage *)psp; + todo_wine ok(extra_data->extra_data == 0x1234, "Expected extra_data to be preserved, got %lx\n", + extra_data->extra_data); + } switch (msg) { @@ -1078,6 +1085,12 @@ static UINT CALLBACK proppage_callback_w(HWND hwnd, UINT msg, PROPSHEETPAGEW *ps psp->lParam, psp); ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); ok(!lstrcmpW(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); + if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called)) + { + struct custom_proppage *extra_data = (struct custom_proppage *)psp; + todo_wine ok(extra_data->extra_data == 0x4321, "Expected extra_data to be preserved, got %lx\n", + extra_data->extra_data); + } switch (msg) { @@ -1110,8 +1123,11 @@ static void test_CreatePropertySheetPage(void) page.u.pageA.pszTitle = "Title"; /* Only minimal size validation is performed */ - for (page.u.pageA.dwSize = PROPSHEETPAGEA_V1_SIZE - 1; page.u.pageA.dwSize <= PROPSHEETPAGEA_V4_SIZE + 1; page.u.pageA.dwSize++) + for (page.u.pageA.dwSize = PROPSHEETPAGEA_V1_SIZE - 1; + page.u.pageA.dwSize <= FIELD_OFFSET(struct custom_proppage, addref_called); + page.u.pageA.dwSize++) { + page.extra_data = 0x1234; page.addref_called = 0; hpsp = pCreatePropertySheetPageA(&page.u.pageA); @@ -1139,8 +1155,11 @@ static void test_CreatePropertySheetPage(void) page.u.pageW.lParam = (LPARAM)&page; page.u.pageW.pszTitle = L"Title"; - for (page.u.pageW.dwSize = PROPSHEETPAGEW_V1_SIZE - 1; page.u.pageW.dwSize <= PROPSHEETPAGEW_V4_SIZE + 1; page.u.pageW.dwSize++) + for (page.u.pageW.dwSize = PROPSHEETPAGEW_V1_SIZE - 1; + page.u.pageW.dwSize <= FIELD_OFFSET(struct custom_proppage, addref_called); + page.u.pageW.dwSize++) { + page.extra_data = 0x4321; page.addref_called = 0; hpsp = pCreatePropertySheetPageW(&page.u.pageW);

1 0

Piotr Caban : comctl32/tests: Add more PROPSHEETPAGE tests inside callback.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 2a2878551500079a0664977066e036156fedf5f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a2878551500079a0664977066e036… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 16:05:04 2022 +0200 comctl32/tests: Add more PROPSHEETPAGE tests inside callback. --- dlls/comctl32/tests/propsheet.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index eee525a19d3..ca99e11df36 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1049,7 +1049,10 @@ static UINT CALLBACK proppage_callback_a(HWND hwnd, UINT msg, PROPSHEETPAGEA *ps ok(psp->lParam && psp->lParam != (LPARAM)psp, "Expected newly allocated page description, got %Ix, %p\n", psp->lParam, psp); - ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); + if (psp->dwFlags & PSP_USETITLE) + todo_wine ok(psp_orig->pszTitle != psp->pszTitle, "Expected different page title pointer\n"); + else + ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); ok(!lstrcmpA(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called)) { @@ -1148,6 +1151,17 @@ static void test_CreatePropertySheetPage(void) } } + page.u.pageA.dwSize = sizeof(PROPSHEETPAGEA); + page.u.pageA.dwFlags |= PSP_USETITLE; + page.addref_called = 0; + hpsp = pCreatePropertySheetPageA(&page.u.pageA); + ok(hpsp != NULL, "Failed to create a page, size %lu\n", page.u.pageA.dwSize); + ok(page.addref_called == 1, "Expected ADDREF callback message\n"); + page.release_called = 0; + ret = pDestroyPropertySheetPage(hpsp); + ok(ret, "Failed to destroy a page\n"); + ok(page.release_called == 1, "Expected RELEASE callback message\n"); + memset(&page.u.pageW, 0, sizeof(page.u.pageW)); page.u.pageW.dwFlags = PSP_USECALLBACK; page.u.pageW.pfnDlgProc = page_dlg_proc_messages;

1 0

Piotr Caban : comctl32/tests: Test passing PropertySheetPage as HPROPSHEETPAGE.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 89729df986b7142245b34c94b509dd40d35154f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/89729df986b7142245b34c94b509dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 12:07:14 2022 +0200 comctl32/tests: Test passing PropertySheetPage as HPROPSHEETPAGE. --- dlls/comctl32/tests/propsheet.c | 89 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index ca99e11df36..7e0e7087f67 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -42,6 +42,7 @@ static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageA)(const PROPSHEETPAGEA * static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageW)(const PROPSHEETPAGEW *desc); static BOOL (WINAPI *pDestroyPropertySheetPage)(HPROPSHEETPAGE proppage); static INT_PTR (WINAPI *pPropertySheetA)(const PROPSHEETHEADERA *header); +static INT_PTR (WINAPI *pPropertySheetW)(const PROPSHEETHEADERW *header); static BOOL (WINAPI *pIsThemeActive)(void); static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); @@ -1301,6 +1302,92 @@ static void test_page_dialog_texture(void) DestroyWindow(hdlg); } +static void test_invalid_hpropsheetpage(void) +{ + BYTE buf_pspW[sizeof(ULONG_PTR) + sizeof(PROPSHEETPAGEW)]; + BYTE buf_psp[sizeof(ULONG_PTR) + sizeof(PROPSHEETPAGEA)]; + HPROPSHEETPAGE hpsp[1]; + PROPSHEETHEADERW pshW; + PROPSHEETHEADERA psh; + PROPSHEETPAGEW *pspW; + PROPSHEETPAGEA *psp; + LRESULT ret; + HWND hdlg; + + /* LocalSize throws exception on misaligned pointers (x86_64). */ + psp = (PROPSHEETPAGEA *)((ULONG_PTR)buf_psp & 0xf ? buf_psp : buf_psp + sizeof(ULONG_PTR)); + pspW = (PROPSHEETPAGEW *)((ULONG_PTR)buf_pspW & 0xf ? buf_pspW : buf_pspW + sizeof(ULONG_PTR)); + + memset(psp, 0, sizeof(*psp)); + psp->dwSize = sizeof(*psp); + psp->hInstance = GetModuleHandleA(NULL); + U(psp)->pszTemplate = "prop_page1"; + U2(psp)->pszIcon = NULL; + psp->pfnDlgProc = page_dlg_proc; + psp->lParam = 0; + + /* Pass PROPSHEETPAGEA* instead of HPROPSHEETPAGE */ + hpsp[0] = (HPROPSHEETPAGE)psp; + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + psh.pfnCallback = sheet_callback; + + hdlg = (HWND)pPropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + + ret = SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0); + ok(ret, "page was not created\n"); + todo_wine ok((HPROPSHEETPAGE)ret != hpsp[0], "invalid HPROPSHEETPAGE was preserved\n"); + DestroyWindow(hdlg); + + memset(pspW, 0, sizeof(*pspW)); + pspW->dwSize = sizeof(*pspW); + pspW->hInstance = GetModuleHandleA(NULL); + U(pspW)->pszTemplate = L"prop_page1"; + U2(pspW)->pszIcon = NULL; + pspW->pfnDlgProc = page_dlg_proc; + pspW->lParam = 0; + + /* Pass PROPSHEETPAGEW* instead of HPROPSHEETPAGE */ + hpsp[0] = (HPROPSHEETPAGE)pspW; + + hdlg = (HWND)pPropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + + ok(!SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0), "there should be no pages\n"); + /* Pass PROPSHEETPAGE[AW]* instead of HPROPSHEETPAGE */ + ok(!SendMessageW(hdlg, PSM_ADDPAGE, 0, (LPARAM)pspW), "PSM_ADDPAGE succeeded\n"); + ok(SendMessageW(hdlg, PSM_ADDPAGE, 0, (LPARAM)psp), "PSM_ADDPAGE failed\n"); + ok(SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0), "no pages after PSM_ADDPAGE\n"); + DestroyWindow(hdlg); + + /* Pass PROPSHEETPAGEW* instead of HPROPSHEETPAGE */ + hpsp[0] = (HPROPSHEETPAGE)pspW; + + memset(&pshW, 0, sizeof(pshW)); + pshW.dwSize = sizeof(pshW); + pshW.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + pshW.pszCaption = L"test caption"; + pshW.nPages = 1; + pshW.hwndParent = GetDesktopWindow(); + U3(pshW).phpage = hpsp; + pshW.pfnCallback = sheet_callback; + + hdlg = (HWND)pPropertySheetW(&pshW); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + + ret = SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0); + todo_wine ok(ret, "page was not created\n"); + ok((HPROPSHEETPAGE)ret != hpsp[0], "invalid HPROPSHEETPAGE was preserved\n"); + DestroyWindow(hdlg); +} + static void init_comctl32_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1310,6 +1397,7 @@ static void init_comctl32_functions(void) X(CreatePropertySheetPageW); X(DestroyPropertySheetPage); X(PropertySheetA); + X(PropertySheetW); #undef X } @@ -1353,6 +1441,7 @@ START_TEST(propsheet) test_PSM_INSERTPAGE(); test_CreatePropertySheetPage(); test_page_dialog_texture(); + test_invalid_hpropsheetpage(); if (!load_v6_module(&ctx_cookie, &ctx)) return;

1 0

Piotr Caban : comctl32: Don't pass PROPSHEETPAGE to SetWindowSubclass in PROPSHEET_CreatePage.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: b536d57825e2e2b55fce58753989da3ec5638b13 URL: https://gitlab.winehq.org/wine/wine/-/commit/b536d57825e2e2b55fce58753989da… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 17:30:40 2022 +0200 comctl32: Don't pass PROPSHEETPAGE to SetWindowSubclass in PROPSHEET_CreatePage. --- dlls/comctl32/propsheet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a512ca9f361..884a0638abb 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1461,8 +1461,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && (ppshpage->dwFlags & PSP_HIDEHEADER)) { - SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, - (DWORD_PTR)ppshpage); + SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, 0); } if (!(psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)) EnableThemeDialogTexture (hwndPage, ETDT_ENABLETAB);

1 0

Francois Gouget : testbot/LogUtils: Fix the summary flaky count check.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: cd760081220709d18cfe5924a596c38987d52da6 URL: https://gitlab.winehq.org/winehq/tools/-/commit/cd760081220709d18cfe5924a59… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 2 18:15:39 2022 +0200 testbot/LogUtils: Fix the summary flaky count check. --- testbot/lib/WineTestBot/LogUtils.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 98fed6aa..ad708daf 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -365,9 +365,11 @@ sub _NewCurrentUnit($$) UnitsRE => $Unit, UnitSize => 0, LineFailures => 0, + LineFlaky => 0, LineTodos => 0, LineSkips => 0, SummaryFailures => 0, + SummaryFlaky => 0, SummaryTodos => 0, SummarySkips => 0, IsBroken => 0, @@ -424,6 +426,7 @@ sub _CloseTestUnit($$$) if ($Cur->{Dll} ne "" and !$Cur->{IsBroken}) { _CheckSummaryCounter($LogInfo, $Cur, "Failures", "failure"); + _CheckSummaryCounter($LogInfo, $Cur, "Flaky", "flaky"); _CheckSummaryCounter($LogInfo, $Cur, "Todos", "todo"); _CheckSummaryCounter($LogInfo, $Cur, "Skips", "skip"); } @@ -619,7 +622,7 @@ sub ParseWineTestReport($$$) { _CheckUnit($LogInfo, $Cur, $1, "flaky"); _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); - $Cur->{LineFailures}++; + $Cur->{LineFlaky}++; } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* Test marked todo: /) or @@ -714,6 +717,7 @@ sub ParseWineTestReport($$$) # There may be more than one summary line due to child processes $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures} += $Failures; + $Cur->{SummaryFlaky} += $Flaky; $Cur->{SummaryTodos} += $Todos; $Cur->{SummarySkips} += $Skips; $LogInfo->{IsWineTest} = 1;

1 0

Francois Gouget : testbot: Allow two VMs to be active at the same time.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: 562784083371bb2ef3e59ccfb98aba43c8afbd35 URL: https://gitlab.winehq.org/winehq/tools/-/commit/562784083371bb2ef3e59ccfb98… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 2 17:15:27 2022 +0200 testbot: Allow two VMs to be active at the same time. An active VM is one that is either idle, running tests or reverting. --- testbot/lib/WineTestBot/Config.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 6f57995e..e0947b65 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -88,10 +88,10 @@ sub PrependPaths(@) $WineBugUrl = "https://bugs.winehq.org/show_bug.cgi?id="; # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm -$MaxRevertingVMs = 1; -$MaxRevertsWhileRunningVMs = 0; +$MaxRevertingVMs = 2; +$MaxRevertsWhileRunningVMs = 1; $MaxActiveVMs = 2; -$MaxRunningVMs = 1; +$MaxRunningVMs = 2; $MaxVMsWhenIdle = undef; # How long to attempt to connect to the TestAgent while the VM is booting.

1 0

Francois Gouget : testbot: Add an option to test patchsets in one go.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: 05f25bd2342c0811927720f1e5d14e034dae525c URL: https://gitlab.winehq.org/winehq/tools/-/commit/05f25bd2342c0811927720f1e5d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 2 17:54:48 2022 +0200 testbot: Add an option to test patchsets in one go. With this option a single result message is sent for the full patchset. This may mean missing issues fixed in later parts but avoids multiple reports in case an early part introduces new failures. --- testbot/lib/WineTestBot/Config.pm | 8 ++++++-- testbot/lib/WineTestBot/PendingPatchSets.pm | 14 +++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index e0947b65..d1a24288 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -30,7 +30,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $WaitForShutdown $MaxVMErrors $MaxTaskTries - $AdminEMail $RobotEMail + $OnlyCompletePatchSets $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $WineBugUrl $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -47,7 +47,7 @@ require Exporter; $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $WaitForShutdown - $MaxVMErrors $MaxTaskTries $AdminEMail + $MaxVMErrors $MaxTaskTries $OnlyCompletePatchSets $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $WineBugUrl $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -114,6 +114,10 @@ $MaxVMErrors = 3; # How many times to run a test that fails before giving up. $MaxTaskTries = 3; +# Set to true if the combined patchset should be tested all at once +# instead of testing the individual parts one by one. +$OnlyCompletePatchSets = undef; + # Build configure timeout (in seconds) $ReconfigBuildTimeout = 60; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 51a1d134..070a71df 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -104,6 +104,13 @@ sub SubmitSubset($$$) { my ($self, $MaxPart, $FinalPatch) = @_; + if ($OnlyCompletePatchSets and $MaxPart < $self->TotalParts) + { + # Skip over the intermediate patches to instead + # test the full patchset at once it is complete. + return undef; + } + my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patchset.diff"); return "Could not create a combined patch file: $!" if (!$CombinedFile); @@ -117,8 +124,13 @@ sub SubmitSubset($$$) last; } - if ($PartNo == $MaxPart and $PartNo > 1) + if ($OnlyCompletePatchSets) + { + ; # Intermediate parts were not tested so everything must be tested now + } + elsif ($PartNo == $MaxPart and $PartNo > 1) { + # Everything up to the last part separator has already been tested print $CombinedFile LastPartSeparator(); } if (open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id))

1 0

Francois Gouget : testbot: Only test complete patchsets.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: ca13ddef375ff236d3914770311df1698eeb51df URL: https://gitlab.winehq.org/winehq/tools/-/commit/ca13ddef375ff236d3914770311… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 2 18:02:53 2022 +0200 testbot: Only test complete patchsets. This avoids having multiple comments in case an early GitLab merge request commit introduces new failures. --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index d1a24288..fccfba9c 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -116,7 +116,7 @@ $MaxTaskTries = 3; # Set to true if the combined patchset should be tested all at once # instead of testing the individual parts one by one. -$OnlyCompletePatchSets = undef; +$OnlyCompletePatchSets = 1; # Build configure timeout (in seconds) $ReconfigBuildTimeout = 60;

1 0

Francois Gouget : testbot/LogUtils: Add support for flaky lines in report comparisons.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: 89b823e57ff23eaedc67a969addd560f617176ef URL: https://gitlab.winehq.org/winehq/tools/-/commit/89b823e57ff23eaedc67a969add… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 15 17:37:28 2022 +0200 testbot/LogUtils: Add support for flaky lines in report comparisons. Otherwise a simple line number change will prevent a flaky error from matching a previous instance. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ad708daf..7780d1c8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1206,7 +1206,7 @@ sub _GetLineKey($) $Line =~ s/ +$//; # Remove the line number - $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( Test (?:failed|succeeded inside todo block):)/$1$2/ + $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( Test (?:failed|marked flaky|succeeded inside (?:flaky )?todo block):)/$1$2/ or $Line =~ s/^([._a-zA-Z0-9-]+:)\d+(: recipe for target )/$1$2/ # Remove the crash code address: it changes whenever the test is recompiled

1 0