September 2018 - Wine-Devel

[PATCH 2/4] testbot: Remove the $NoUnits GetPatchImpacts() parameter.

by Francois Gouget

The goal was to be able to use it on systems that don't have the winefiles.txt file. However nowadays all systems have access to it. Furthermore the amount of work saved is not really significant so there is no reason for the extra complexity. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/lib/Build/Utils.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 9 +++++---- testbot/lib/WineTestBot/Patches.pm | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index d9bedb533..ec36b629a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -446,7 +446,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # -my $Impacts = GetPatchImpacts($FileName, "nounit"); +my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 38a801260..2fe7a9778 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -113,7 +113,7 @@ sub ApplyPatch($$) return undef; } - my $Impacts = GetPatchImpacts($PatchFile, "nounits"); + my $Impacts = GetPatchImpacts($PatchFile); if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 4a1761afb..4ce5bf40c 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -193,7 +193,6 @@ sub _HandleFile($$$) } return; } - return if ($Impacts->{NoUnits}); if (!$Tests->{$Module}->{Files}) { @@ -258,15 +257,17 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpacts($;$$) +sub GetPatchImpacts($;$) { - my ($PatchFileName, $NoUnits, $PastImpacts) = @_; + my ($PatchFileName, $PastImpacts) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); my $Impacts = { - NoUnits => $NoUnits, + # Number of test units impacted either directly, or indirectly by a module + # patch. + ModuleUnitCount => 0, # Number of patched test units. UnitCount => 0, # The modules that need a rebuild, even if only for the tests. diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a052c5a8c..5024ed489 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -134,7 +134,7 @@ sub Submit($$$) my $PastImpacts; $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); - my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, undef, $PastImpacts); + my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, $PastImpacts); if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and !$Impacts->{TestBuild}) -- 2.18.0

Sept. 19, 2018

[PATCH 1/4] testbot: Rename the patch analyzer to GetPatchImpacts().

by Francois Gouget

The returned structure is called $Impacts everywhere so this makes the naming more consistent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/lib/Build/Utils.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 6 +++--- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/web/Submit.pl | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 11b41c67a..d9bedb533 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -446,7 +446,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # -my $Impacts = GetPatchImpact($FileName, "nounit"); +my $Impacts = GetPatchImpacts($FileName, "nounit"); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index fd1b8467c..38a801260 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -113,7 +113,7 @@ sub ApplyPatch($$) return undef; } - my $Impacts = GetPatchImpact($PatchFile, "nounits"); + my $Impacts = GetPatchImpacts($PatchFile, "nounits"); if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7049694aa..4a1761afb 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -31,7 +31,7 @@ the Wine builds. =cut use Exporter 'import'; -our @EXPORT = qw(GetPatchImpact UpdateWineData GetBuildTimeout); +our @EXPORT = qw(GetPatchImpacts UpdateWineData GetBuildTimeout); use List::Util qw(min max); @@ -249,7 +249,7 @@ sub _HandleFile($$$) =pod =over 12 -=item C<GetPatchImpact()> +=item C<GetPatchImpacts()> Analyzes a patch and returns a hashtable describing the impact it has on the Wine build: whether it requires updating the makefiles, re-running autoconf or @@ -258,7 +258,7 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($;$$) +sub GetPatchImpacts($;$$) { my ($PatchFileName, $NoUnits, $PastImpacts) = @_; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 390b1611c..a052c5a8c 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -133,8 +133,8 @@ sub Submit($$$) my ($self, $PatchFileName, $IsSet) = @_; my $PastImpacts; - $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); - my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); + $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); + my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and !$Impacts->{TestBuild}) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 621b01728..fe101042c 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -597,7 +597,7 @@ sub DetermineFileType($$) my ($ErrMessage, $ExeBase, $TestUnit); if ($FileType eq "unknown") { - my $Impacts = GetPatchImpact($FileName); + my $Impacts = GetPatchImpacts($FileName); if ($Impacts->{UnitCount} == 0) { $ErrMessage = "Patch doesn't affect tests"; @@ -781,7 +781,7 @@ sub OnSubmit($) if ($FileType eq "patch") { my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); - $Impacts = GetPatchImpact($TmpStagingFullPath); + $Impacts = GetPatchImpacts($TmpStagingFullPath); } my $BuildStep; -- 2.18.0

Sept. 19, 2018

Re: [PATCH 1/2] msi/tests: Also test full range of properties for MsiSummaryInfoSetPropertyW. (v2)

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42233 Your paranoid android. === w7u (32 bit Windows report) === msi: action: Timeout === w7u (32 bit Windows report) === msi: install: Timeout === w7u (32 bit Windows report) === msi: msi: Timeout === w1064 (32 bit Windows report) === === w1064 (task log) === Task errors: TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally

Sept. 19, 2018

Re: [PATCH 4/4] msi/tests: Add a test for repetitive MsiGetActiveDatabase calls.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42226 Your paranoid android. === w7u (32 bit Windows report) === msi: action: Timeout === wxppro (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w2003std (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === wvistau64 (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === wvistau64_zh_CN (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === wvistau64_fr (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === wvistau64_he (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w2008s64 (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w7u (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 install: Timeout Report errors: msi:install contains a misplaced failure message for custom === w7pro64 (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w8 (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w8adm (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w864 (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w1064 (32 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === wvistau64 (64 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w2008s64 (64 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w7pro64 (64 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w864 (64 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w1064 (64 bit Windows report) === msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 Report errors: msi:install contains a misplaced failure message for custom === w7u (32 bit Windows report) === msi: msi: Timeout

Sept. 19, 2018

Re: [PATCH 3/4] msi/tests: Also test full range of properties for MsiSummaryInfoSetPropertyW.

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > This is causing new test failures. The testbot fails recognize them > however, probably because they come from custom.c instead of the test > module that was invoked, install.c. I resent 2 last patches, let's see how it goes. Sending the patch alone to the testbot didn't work: "test 'custom' doesn't exist". -- Dmitry.

Sept. 19, 2018

[PATCH 2/2] msi/tests: Add a test for repetitive MsiGetActiveDatabase calls.

by Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index c9ec82fd93..cd6cb0c378 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -281,7 +281,7 @@ static void test_db(MSIHANDLE hinst) VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_I4, VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY }; - MSIHANDLE hdb, view, rec, rec2, suminfo; + MSIHANDLE hdb, hdb2, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; UINT r, count, type, i; @@ -312,6 +312,17 @@ static void test_db(MSIHANDLE hinst) ok(hinst, sz == strlen(buffer), "got size %u\n", sz); ok(hinst, !strcmp(buffer, "Name"), "got '%s'\n", buffer); + /* Test MsiGetActiveDatabase + MsiDatabaseIsTablePersistent once again */ + hdb2 = MsiGetActiveDatabase(hinst); + ok(hinst, hdb2, "MsiGetActiveDatabase failed\n"); + ok(hinst, hdb2 != hdb, "db handles should be different\n"); + + r = MsiDatabaseIsTablePersistentA(hdb2, "Test"); + ok(hinst, r == MSICONDITION_TRUE, "got %u\n", r); + + r = MsiCloseHandle(hdb2); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(rec2); ok(hinst, !r, "got %u\n", r); -- 2.17.1

Sept. 19, 2018

[PATCH 1/2] msi/tests: Also test full range of properties for MsiSummaryInfoSetPropertyW. (v2)

by Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index f06aee0675..c9ec82fd93 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -510,12 +510,14 @@ static void test_db(MSIHANDLE hinst) for (i = 0; i < 20; i++) { + WCHAR emptyW[1] = { 0 }; + r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - } - r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); - ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, emptyW); + ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); + } r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r); -- 2.17.1

Sept. 19, 2018

Re: [PATCH 3/4] msi/tests: Also test full range of properties for MsiSummaryInfoSetPropertyW.

by Hans Leidekker

On Wed, 2018-09-19 at 13:27 +0800, Dmitry Timoshkov wrote: > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > --- > dlls/msi/tests/custom.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c > index f06aee0675..c6e9f1eb52 100644 > --- a/dlls/msi/tests/custom.c > +++ b/dlls/msi/tests/custom.c > @@ -512,10 +512,10 @@ static void test_db(MSIHANDLE hinst) > { > r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); > ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); > - } > > - r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); > - ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); > + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, NULL); > + ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); > + } > > r = MsiCloseHandle(suminfo); > ok(hinst, !r, "got %u\n", r); This is causing new test failures. The testbot fails recognize them however, probably because they come from custom.c instead of the test module that was invoked, install.c.

Sept. 19, 2018

Re: [PATCH 2/4] msi: Do not attempt to copy a not string property in MsiSummaryInfoGetProperty.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Sept. 19, 2018

Re: [PATCH 1/4] msi: Move parameter checks to a common helper in MsiSummaryInfoSetProperty.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Sept. 19, 2018