June 2018 - Wine-Devel - list.winehq.org

[PATCH 2/2] testbot/build: Fix the CountCPUs() indentation.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 18 +++++++++--------- testbot/bin/build/Reconfig.pl | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index a7ecb1f1c..f516cf184 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -109,8 +109,8 @@ sub ApplyPatch($) ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { - LogMsg "Autoconf failed\n"; - return undef; + LogMsg "Autoconf failed\n"; + return undef; } } @@ -120,13 +120,13 @@ sub ApplyPatch($) my $ncpus; sub CountCPUs() { - if (open(my $fh, "<", "/proc/cpuinfo")) - { - # Linux - map { $ncpus++ if (/^processor/); } <$fh>; - close($fh); - } - $ncpus ||= 1; + if (open(my $fh, "<", "/proc/cpuinfo")) + { + # Linux + map { $ncpus++ if (/^processor/); } <$fh>; + close($fh); + } + $ncpus ||= 1; } sub BuildNative() diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index f84c80458..977df6e12 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -102,13 +102,13 @@ sub GitPull() my $ncpus; sub CountCPUs() { - if (open(my $fh, "<", "/proc/cpuinfo")) - { - # Linux - map { $ncpus++ if (/^processor/); } <$fh>; - close($fh); - } - $ncpus ||= 1; + if (open(my $fh, "<", "/proc/cpuinfo")) + { + # Linux + map { $ncpus++ if (/^processor/); } <$fh>; + close($fh); + } + $ncpus ||= 1; } sub BuildTestAgentd() -- 2.17.1

June 12, 2018

[PATCH 1/2] testbot/build: Always rebuild all the impacted test executables.

by Francois Gouget

This means Build.pl no longer needs the PatchType and BaseName parameters. But still keep support for them for compatibility with WineRunBuild.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Later on this will make it possible to reduce the number of build tasks (and associated reverts), and to have only one job per patch. testbot/bin/build/Build.pl | 104 +++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 56 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 77bc9ca9d..a7ecb1f1c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -6,6 +6,7 @@ # resulting 32 and 64 bit binaries. # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2014, 2017-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -83,7 +84,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return 0; + return undef; } my $Impacts = GetPatchImpact($PatchFile, "nounits"); @@ -96,7 +97,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return 0; + return undef; } } @@ -109,11 +110,11 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Autoconf failed\n"; - return 0; + return undef; } } - return 1; + return $Impacts; } my $ncpus; @@ -136,57 +137,71 @@ sub BuildNative() system("( cd $DataDir/build-native && set -x && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) { - LogMsg "Build native failed\n"; + LogMsg "Rebuild of native tools failed\n"; return !1; } return 1; } -sub BuildTestExecutable($$$) +sub BuildTestExecutables($$) { - my ($BaseName, $PatchType, $Bits) = @_; + my ($Impacts, $Bits) = @_; - my $TestsDir = "$PatchType/$BaseName/tests"; - my $TestExecutable = "$TestsDir/$BaseName"; - if ($PatchType eq "programs") + my (@BuildDirs, @TestExes); + foreach my $TestInfo (values %{$Impacts->{Tests}}) { - $TestExecutable .= ".exe"; + push @BuildDirs, $TestInfo->{Path}; + my $TestExe = "$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; + push @TestExes, $TestExe; + unlink("$DataDir/build-mingw$Bits/$TestExe"); # Ignore errors } - $TestExecutable .= "_test.exe"; - unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); - InfoMsg "\nBuilding the $Bits-bit test executable\n"; + InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus $TestsDir " . + " time make -j$ncpus ". join(" ", sort @BuildDirs) . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; return !1; } - if (! -f "$DataDir/build-mingw${Bits}/$TestExecutable") + + my $Success = 1; + foreach my $TestExe (@TestExes) { - LogMsg "Make didn't produce a $TestExecutable file\n"; - return !1; + if (!-f "$DataDir/build-mingw$Bits/$TestExe") + { + LogMsg "Make didn't produce a $TestExe file\n"; + $Success = undef; + } } - return 1; + return $Success; } $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -# Start with clean logfile +# Start with a clean logfile unlink("$LogDir/Build.log"); -my ($PatchFile, $PatchType, $BaseName, $BitIndicators) = @ARGV; -if (! $PatchFile || ! $PatchType || ! $BaseName || !$BitIndicators) +my ($PatchFile, $BitIndicators); +if (@ARGV == 2) { - FatalError "Usage: Build.pl <patchfile> <patchtype> <basename> <bits>\n"; + ($PatchFile, $BitIndicators) = @ARGV; +} +else +{ + # FIXME Remove support for the legacy parameters + my ($_PatchType, $_BaseName); + ($PatchFile, $_PatchType, $_BaseName, $BitIndicators) = @ARGV; +} +if (! $PatchFile || !$BitIndicators) +{ + FatalError "Usage: Build.pl <patchfile> <bits>\n"; } # Untaint parameters @@ -203,36 +218,16 @@ else FatalError "Invalid patch file $PatchFile\n"; } -if ($PatchType =~ m/^patch(dlls|programs)$/) -{ - $PatchType = $1; -} -else -{ - FatalError "Invalid patch type $PatchType\n"; -} - -if ($BaseName =~ m/^([\w_.\-]+)$/) -{ - $BaseName = $1; -} -else -{ - FatalError "Invalid DLL base name $BaseName\n"; -} - -my $Run32 = !1; -my $Run64 = !1; +my ($Run32, $Run64); if ($BitIndicators =~ m/^([\d,]+)$/) { - my @Bits = split /,/, $1; - foreach my $BitsValue (@Bits) + foreach my $BitsValue (split /,/, $1) { - if ($BitsValue == 32) + if ($BitsValue eq "32") { $Run32 = 1; } - elsif ($BitsValue == 64) + elsif ($BitsValue eq "64") { $Run64 = 1; } @@ -241,7 +236,7 @@ if ($BitIndicators =~ m/^([\d,]+)$/) FatalError "Invalid number of bits $BitsValue\n"; } } - if (! $Run32 && ! $Run64) + if (!$Run32 && !$Run64) { FatalError "Specify at least one of 32 or 64 bits\n"; } @@ -251,10 +246,8 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } -if (!ApplyPatch($PatchFile)) -{ - exit(1); -} +my $Impacts = ApplyPatch($PatchFile); +exit(1) if (!$Impacts); CountCPUs(); @@ -262,12 +255,11 @@ if (!BuildNative()) { exit(1); } - -if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32)) +if ($Run32 && !BuildTestExecutables($Impacts, 32)) { exit(1); } -if ($Run64 && ! BuildTestExecutable($BaseName, $PatchType, 64)) +if ($Run64 && !BuildTestExecutables($Impacts, 64)) { exit(1); } -- 2.17.1

June 12, 2018

[PATCH] testbot: Make sure UpdateStatus() iterates over all the Steps and Tasks.

by Francois Gouget

It tends to be called from places where filters have been put on the Steps and/or Tasks collections which prevents it from getting the full picture. So work on a clone that has no filter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b3512e1f2..a13b3468e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -209,7 +209,7 @@ sub UpdateStatus($) return $Status if ($Status ne "queued" && $Status ne "running"); my %Has; - my $Steps = $self->Steps; + my $Steps = $self->Steps->Clone(); my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; foreach my $Step (@SortedSteps) { diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index aea1aee04..8afe79396 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -199,7 +199,7 @@ sub UpdateStatus($$) return $Status if ($Status ne "queued" && $Status ne "running"); my %Has; - map { $Has{$_->UpdateStatus($Skip)} = 1 } (@{$self->Tasks->GetItems()}); + map { $Has{$_->UpdateStatus($Skip)} = 1 } (@{$self->Tasks->Clone()->GetItems()}); # Inherit the tasks most significant status. # Note that one or more tasks may have been requeued during the cleanup phase -- 2.17.1

June 12, 2018

[PATCH] testbot: Ignore process deadlines for the disabled VMs.

by Francois Gouget

Disabled VMs should probably not have deadlines but it makes sense to ignore them anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 85bc0f397..159b10cf8 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -1010,7 +1010,9 @@ sub ScheduleJobs() # Reschedule at the latest when the next task times out my $FirstDeadline; - foreach my $VM (@{$Sched->{VMs}->GetItems()}) + my $VMs = $Sched->{VMs}->Clone(); + $VMs->FilterEnabledRole(); + foreach my $VM (@{$VMs->GetItems()}) { if (defined $VM->ChildDeadline and (!defined $FirstDeadline or $VM->ChildDeadline < $FirstDeadline)) -- 2.17.1

June 12, 2018

[PATCH] testbot: Update Job::Restart() for the new Job file storage.

by Francois Gouget

With the new file storage scheme the Step directories only contain generated files and thus they can all be deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Restarting an old job that still uses the old scheme will delete the input file, thus breaking that job. However the restart button is currently only available on three jobs, two where only the administrator can trigger it (39025 and 39003), and one job which is already broken (39001, I attribute this one to a temporary insanity episode of the TestBot, it's a multiple modules test patch). testbot/lib/WineTestBot/Jobs.pm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 3fd78aaa2..b3512e1f2 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -352,7 +352,6 @@ sub Restart($) return "This job is already " . $self->Status; } - my $FirstStep = 1; my $Steps = $self->Steps; my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; foreach my $Step (@SortedSteps) @@ -360,21 +359,13 @@ sub Restart($) my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()}) { - if ($FirstStep) - { - # The first step contains the patch or test executable - # so only delete its task folders - $Task->RmTree(); - } $Task->Status("queued"); $Task->Started(undef); $Task->Ended(undef); $Task->TestFailures(undef); } - # Subsequent steps only contain files generated by the previous steps - $Step->RmTree() if (!$FirstStep); - $FirstStep = undef; $Step->Status("queued"); + $Step->RmTree(); } $self->Status("queued"); $self->Submitted(time); -- 2.17.1

June 12, 2018

[PATCH] testbot: A minor indentation fix in PatchUtils.pm.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 02c89e285..833394abe 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -211,8 +211,8 @@ sub GetPatchImpact($;$$) last; } if (exists $TestInfo->{Files}->{"$Base.spec"} and - ($TestInfo->{Files}->{"$Base.c"} or - $TestInfo->{Files}->{"$Base.spec"})) + ($TestInfo->{Files}->{"$Base.c"} or + $TestInfo->{Files}->{"$Base.spec"})) { # Any change to a helper dll can potentially impact all tests $AllUnits = 1; -- 2.17.1

June 12, 2018

[PATCH] testbot: Make sure AddReconfigJob() returns true when successful.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 137db572c..80c57b9e1 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -291,6 +291,8 @@ sub AddReconfigJob() Error "Failed to save the Reconfig job (staging): $ErrMessage\n"; return 0; } + + return 1; } -- 2.17.1

June 12, 2018

Re: [PATCH 04/17] vcomp/tests: Use the available ARRAY_SIZE() macro

by André Hentschel

Am 30.05.2018 um 21:15 schrieb Michael Stefaniuc: > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > --- > dlls/vcomp/tests/vcomp.c | 56 ++++++++++++++++++++++++------------------------ > 1 file changed, 28 insertions(+), 28 deletions(-) I accidentally wrote the exact same patch, so here is my signoff, not sure if we should wait for that from Sebastian? Signed-off-by: André Hentschel <nerv(a)dawncrow.de>

June 12, 2018

Re: [PATCH] winhttp/tests: Use the available ARRAY_SIZE() macro

by Hans Leidekker

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

June 12, 2018

Re: [PATCH 1/7] wsdapi: Add support for listening for UDP multicast broadcasts.

by Huw Davies

On Mon, Jun 11, 2018 at 11:06:14PM +0100, Owen Rudge wrote: > v2: Returns HRESULT from functions where applicable, adds Probe message body > parsing to avoid leaving todo_wine statements in place. > > Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> > > --- > dlls/wsdapi/network.c | 281 > +++++++++++++++++++++++++++++++++++++++++- > dlls/wsdapi/wsdapi_internal.h | 4 + > 2 files changed, 284 insertions(+), 1 deletion(-) > > > void terminate_networking(IWSDiscoveryPublisherImpl *impl) > { > BOOL needsCleanup = impl->publisherStarted; > > impl->publisherStarted = FALSE; > + WaitForMultipleObjects(impl->num_thread_handles, impl->thread_handles, TRUE, INFINITE); The thread handles need closing. > > if (needsCleanup) > WSACleanup(); > @@ -254,6 +524,15 @@ BOOL init_networking(IWSDiscoveryPublisherImpl *impl) > > impl->publisherStarted = TRUE; > > - /* TODO: Start listening */ > + if ((impl->addressFamily & WSDAPI_ADDRESSFAMILY_IPV4) && (!start_listening_on_all_addresses(impl, AF_INET))) > + goto cleanup; > + > + if ((impl->addressFamily & WSDAPI_ADDRESSFAMILY_IPV6) && (!start_listening_on_all_addresses(impl, AF_INET6))) > + goto cleanup; > + > return TRUE; > + > +cleanup: > + terminate_networking(impl); > + return FALSE; > } > diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h > index 45d54c2ef1..f88822d5ef 100644 > --- a/dlls/wsdapi/wsdapi_internal.h > +++ b/dlls/wsdapi/wsdapi_internal.h > @@ -40,6 +40,8 @@ struct notificationSink > IWSDiscoveryPublisherNotify *notificationSink; > }; > > +#define MAX_WSD_THREADS 20 > + > typedef struct IWSDiscoveryPublisherImpl { > IWSDiscoveryPublisher IWSDiscoveryPublisher_iface; > LONG ref; > @@ -47,6 +49,8 @@ typedef struct IWSDiscoveryPublisherImpl { > DWORD addressFamily; > struct list notificationSinks; > BOOL publisherStarted; > + HANDLE thread_handles[MAX_WSD_THREADS]; > + int num_thread_handles; > } IWSDiscoveryPublisherImpl; > > /* network.c */ > >

June 12, 2018