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

[PATCH] testbot: Strip the prefix from the VM name for the WineTest tag.
by Francois Gouget June 14, 2018

June 14, 2018

This avoids duplication in case the VM names happen to have the same prefix that would be used for the WineTest reports. Also trust the administrator to know what to put in $TagPrefix (i.e. don't lowercase it). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The official TestBot VM names don't have prefixes so I guess this is mostly of use to me but I think there is no harm in having it in the main branch. My VMs have an 'fgtb' prefix so I can easily distinguish them from the official VMs: for instance fgtbwinxp vs wxppro. But since my $TagPrefix is 'fgtb' this results in tags such as 'fgtb-fgtbwinxp'. This patch ensures the tag is 'fgtb-winxp' which is cleaner and also much less likely to result in a tag that's too long. testbot/bin/WineRunTask.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3290b0bc6..8f5cb268c 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -442,7 +442,8 @@ elsif ($Step->Type eq "suite") { $Keepalive = 60; $Script .= "$FileName "; - my $Tag = lc($TagPrefix) . "-" . lc($VM->Name); + my $Tag = lc($VM->Name); + $Tag =~ s/^$TagPrefix//; $Tag =~ s/[^a-zA-Z0-9]/-/g; if ($VM->Type eq "win64") { @@ -468,7 +469,7 @@ elsif ($Step->Type eq "suite") $Info =~ s/"/\\"/g; $Info =~ s/%/%%/g; $Info =~ s/%/%%/g; - $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n" . + $Script .= "-q -o $RptFileName -t $TagPrefix-$Tag -m \"$EMail\" -i \"$Info\"\r\n". "$FileName -q -s $RptFileName\r\n"; } Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.17.1

1 0

[PATCH 1/2] testbot/web: Deprecate the patchprograms Step file type.
by Francois Gouget June 14, 2018

June 14, 2018

The patchdlls / patchprograms Step::FileType distinction is obsolete since build steps may now have to handle patches that include both. So as a first step standardize on patchdlls to identify patch files. Later on support for patchprograms can be removed altogether. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 1 - testbot/web/Submit.pl | 19 +++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 14a598545..ec609d987 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -115,7 +115,6 @@ sub _AddTest($$$) my $ExeBase = ($Root eq "programs") ? "${Module}.exe_test" : "${Module}_test"; $Tests->{$Module} = { - "Type" => "patch$Root", "Module" => $Module, "Path" => "$Root/$Module/tests", "ExeBase" => $ExeBase, diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 97f31d10c..1425301ea 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -118,8 +118,7 @@ sub GetPropertyDescriptors($) } elsif ($self->{Page} == 3) { - my $IsPatch = ($self->GetParam("FileType") eq "patchdlls" || - $self->GetParam("FileType") eq "patchprograms"); + my $IsPatch = ($self->GetParam("FileType") eq "patchdlls"); $self->{PropertyDescriptors3}[0]->{IsRequired} = $IsPatch; return $self->{PropertyDescriptors3}; } @@ -386,8 +385,7 @@ sub DisplayProperty($$) if ($self->{Page} == 3) { my $PropertyName = $PropertyDescriptor->GetName(); - if ($self->GetParam("FileType") eq "patchdlls" || - $self->GetParam("FileType") eq "patchprograms") + if ($self->GetParam("FileType") eq "patchdlls") { if ($PropertyName eq "Run64") { @@ -477,8 +475,6 @@ sub Validate($) { if (($self->GetParam("FileType") eq "patchdlls" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || - ($self->GetParam("FileType") eq "patchprograms" && - $self->GetParam("TestExecutable") !~ m/^[\w_.]+\.exe_test\.exe$/) || ($self->GetParam("TestExecutable") =~ m=(?:[a-z]:|[/\\])=i)) { $self->{ErrField} = "TestExecutable"; @@ -603,7 +599,7 @@ sub DetermineFileType($$) else { my $TestInfo = (values %{$Impacts->{Tests}})[0]; - $FileType = $TestInfo->{Type}; + $FileType = "patchdlls"; $ExeBase = $TestInfo->{ExeBase}; $TestUnit = (keys %{$TestInfo->{Units}})[0]; } @@ -651,8 +647,7 @@ sub OnPage1Next($) $self->{ErrMessage} = $ErrMessage; return !1; } - if ($FileType ne "patchdlls" && $FileType ne "patchprograms" && - $FileType ne "exe32" && $FileType ne "exe64") + if ($FileType !~ /^(?:exe32|exe64|patchdlls)$/) { $self->{ErrField} = "File"; $self->{ErrMessage} = "Unrecognized file type"; @@ -772,7 +767,7 @@ sub OnSubmit($) my $BuildStep; my $FileType = $self->GetParam("FileType"); - if ($FileType eq "patchdlls" || $FileType eq "patchprograms") + if ($FileType eq "patchdlls") { # This is a patch so add a build step... $BuildStep = $Steps->Add(); @@ -805,7 +800,7 @@ sub OnSubmit($) { next if ($Bits eq "32" && $FileType eq "exe64"); next if ($Bits eq "64" && $FileType eq "exe32"); - next if ($Bits eq "64" && $FileType =~ /^patch/ && !defined($self->GetParam("Run64"))); + next if ($Bits eq "64" && $FileType eq "patchdlls" && !defined($self->GetParam("Run64"))); my $Tasks; my $VMs = CreateVMs(); @@ -821,7 +816,7 @@ sub OnSubmit($) { # First create the test step my $TestStep = $Steps->Add(); - if ($FileType eq "patchdlls" || $FileType eq "patchprograms") + if ($FileType eq "patchdlls") { $TestStep->PreviousNo($BuildStep->No); my $TestExe = basename($self->GetParam("TestExecutable")); -- 2.17.1

1 1

[PATCH 1/2] testbot/build: Let PatchUtils.pm generate testlist.txt.
by Francois Gouget June 14, 2018

June 14, 2018

This makes it possible to reuse the code in other build scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Like the script to update the VMs for testing patches in Wine... testbot/bin/build/Reconfig.pl | 18 ++++----------- testbot/lib/WineTestBot/PatchUtils.pm | 33 ++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 32cbad7c7..c950d4974 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -41,6 +41,7 @@ sub BEGIN } use WineTestBot::Config; +use WineTestBot::PatchUtils; my $LogFileName = "$LogDir/Reconfig.log"; @@ -133,20 +134,11 @@ sub GitPull() return !1; } - if (open(my $fh, ">", "$DataDir/testlist.txt")) + my $ErrMessage = UpdateWineData("$DataDir/wine"); + if ($ErrMessage) { - foreach my $TestFile (glob("$DataDir/wine/*/*/tests/*.c"), - glob("$DataDir/wine/*/*/tests/*.spec")) - { - next if ($TestFile =~ m=/testlist\.c$=); - $TestFile =~ s=^$DataDir/wine/==; - print $fh "$TestFile\n"; - } - close($fh); - } - else - { - LogMsg "Could not open 'testlist.txt' for writing: $!\n"; + LogMsg "$ErrMessage\n"; + return !1; } return 1; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 833394abe..3a555af9d 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -31,11 +31,42 @@ the Wine builds. =cut use Exporter 'import'; -our @EXPORT = qw(GetPatchImpact); +our @EXPORT = qw(GetPatchImpact UpdateWineData); use WineTestBot::Config; +=pod +=over 12 + +=item C<UpdateWineData()> + +Updates the summary information about the Wine source such as the list of +tests (testlist.txt). + +=back +=cut + +sub UpdateWineData($) +{ + my ($WineDir) = @_; + + if (open(my $fh, ">", "$DataDir/testlist.txt")) + { + foreach my $TestFile (glob("$WineDir/*/*/tests/*.c"), + glob("$WineDir/*/*/tests/*.spec")) + { + next if ($TestFile =~ m=/testlist\.c$=); + $TestFile =~ s=^$WineDir/==; + print $fh "$TestFile\n"; + } + close($fh); + return undef; + } + + return "Could not open 'testlist.txt' for writing: $!"; +} + =pod =over 12 -- 2.17.1

1 1

[PATCH] testbot/web: One cannot create a test job from a dll.
by Francois Gouget June 14, 2018

June 14, 2018

DetermineFileType() transforms these file types to unknown so they get rejected. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index ac9a38488..97f31d10c 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -240,7 +240,7 @@ sub GenerateFields($) print "</th><tbody>\n"; my $VMs = CreateVMs(); - if ($self->{FileType} eq "exe64" || $self->{FileType} eq "dll64") + if ($self->{FileType} eq "exe64") { $VMs->AddFilter("Type", ["win64"]); } -- 2.17.1

1 0

[PATCH] testbot: Standardize and clean up the WineRun*.pl scripts logging.
by Francois Gouget June 14, 2018

June 14, 2018

Also show which command is being run like the client-side scripts do. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 8 ++++---- testbot/bin/WineRunReconfig.pl | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 31decc107..96d9321b8 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -350,10 +350,10 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) { FatalTAError($TA, "Could not copy the patch to the VM"); } -my $Script = "#!/bin/sh\n" . - "rm -f Build.log\n" . - "../bin/build/Build.pl patch.diff ". join(",", keys %Bitnesses) . - " >>Build.log 2>&1\n"; +my $Script = "#!/bin/sh\n". + "( set -x\n". + " ../bin/build/Build.pl patch.diff ". join(",", sort keys %Bitnesses) ."\n". + ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 99b73da6f..4fb34a07d 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -328,10 +328,12 @@ elsif ($Debug and !$VM->GetDomain()->IsPoweredOn()) # Run the build # -my $Script = "#!/bin/sh\n" . - "(" . - " git pull &&\n" . - " ../bin/build/Reconfig.pl\n" . +# Use our own log so it can be used for reference +# even after another task has run. +my $Script = "#!/bin/sh\n". + "( set -x\n". + " git pull &&\n". + " ../bin/build/Reconfig.pl\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.17.1

1 0

[PATCH] testbot/build: Add an empty line before the GitPull() message.
by Francois Gouget June 14, 2018

June 14, 2018

GitPull() is not the first command being run anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 706da255a..32cbad7c7 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -125,7 +125,7 @@ sub BuildTestLauncher() sub GitPull() { - InfoMsg "Updating the Wine source\n"; + InfoMsg "\nUpdating the Wine source\n"; system("cd $DataDir/wine && git pull >>$LogFileName 2>&1"); if ($? != 0) { -- 2.17.1

1 0

[PATCH 7/7] wsdapi: Build types list when parsing Probe message.
by Owen Rudge June 14, 2018

June 14, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 91 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- dlls/wsdapi/wsdapi_internal.h | 1 + dlls/wsdapi/xml.c | 16 ++++++++ 4 files changed, 108 insertions(+), 2 deletions(-)

2 1

[PATCH 6/7] wsdapi: Implement probe message parsing.
by Owen Rudge June 14, 2018

June 14, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 4 ++-- 2 files changed, 41 insertions(+), 3 deletions(-)

2 1

[PATCH 5/7] wsdapi: Return "any" headers in read_message.
by Owen Rudge June 14, 2018

June 14, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-)

2 1

[PATCH 4/7] wsdapi: Add initial support for reading messages; identify Probe message.
by Owen Rudge June 14, 2018

June 14, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 388 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 6 +- 2 files changed, 389 insertions(+), 5 deletions(-)

2 1