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

Francois Gouget : testbot/WineSendLog: Use LogUtils to get the report / log filename.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: tools Branch: master Commit: def85444649f5d461139802e88c2fb26c42a12f5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=def85444649f5d461139802… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 26 13:30:05 2018 +0200 testbot/WineSendLog: Use LogUtils to get the report / log filename. Currently we will either have a test report or a task log file so it's ok to only take into account the first file returned by GetLogFileNames(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 3397809..53b184c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -272,11 +272,13 @@ EOF foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); + my $TaskDir = $StepTask->GetTaskDir(); print SENDMAIL "\n=== ", $StepTask->GetTitle(), " ===\n"; - my $TaskDir = $StepTask->GetTaskDir(); - if (open LOGFILE, "<$TaskDir/log") + my $LogFiles = GetLogFileNames($TaskDir); + my $LogName = $LogFiles->[0] || "log"; + if (open LOGFILE, "<$TaskDir/$LogName") { my $HasLogEntries = !1; my $PrintedSomething = !1; @@ -376,6 +378,7 @@ EOF foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); + my $TaskDir = $StepTask->GetTaskDir(); print SENDMAIL <<"EOF"; --$PART_BOUNDARY @@ -387,9 +390,10 @@ EOF $StepTask->VM->Name, ".log\n\n"; print SENDMAIL "Not dumping logs in debug mode\n" if ($Debug); + my $LogFiles = GetLogFileNames($TaskDir); + my $LogName = $LogFiles->[0] || "log"; my $PrintSeparator = !1; - my $TaskDir = $StepTask->GetTaskDir(); - if (open LOGFILE, "<$TaskDir/log") + if (open LOGFILE, "<$TaskDir/$LogName") { my $Line; while (defined($Line = <LOGFILE>)) @@ -432,8 +436,8 @@ EOF foreach my $Key (@FailureKeys) { my $StepTask = $StepsTasks->GetItem($Key); - my $TaskDir = $StepTask->GetTaskDir(); + my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/err"); if (! $BotFailure) { @@ -449,7 +453,9 @@ EOF # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine # so any failure it reported is not caused by this patch. - $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/log", + my $LogFiles = GetLogFileNames($TaskDir); + my $LogName = $LogFiles->[0] || "log"; + $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/$LogName", $BaseName, $StepTask->CmdLineArg); } } @@ -537,11 +543,14 @@ EOF foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); + my $TaskDir = $StepTask->GetTaskDir(); + print $result "\n=== ", $StepTask->GetTitle(), " ===\n"; + my $LogFiles = GetLogFileNames($TaskDir); + my $LogName = $LogFiles->[0] || "log"; my $PrintSeparator = !1; - my $TaskDir = $StepTask->GetTaskDir(); - if (open(my $logfile, "<", "$TaskDir/log")) + if (open(my $logfile, "<", "$TaskDir/$LogName")) { my $Line; while (defined($Line = <$logfile>))

1 0

Francois Gouget : testbot/WineRunTask: Better detect standard Wine tests.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: tools Branch: master Commit: e8d052930991740c3033197c8f1ad201b1958e1c URL: https://source.winehq.org/git/tools.git/?a=commit;h=e8d052930991740c3033197… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 26 15:07:43 2018 +0200 testbot/WineRunTask: Better detect standard Wine tests. It's better to take the step dependencies into account and to verify that the previous step was dealing with a Wine patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index f6bc8f1..9faae28 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -441,9 +441,10 @@ if ($Step->Type eq "single") } $Script .= "> $RptFileName\r\n"; - # If StepNo is 1 then the user gave us an executable. Then there is no - # telling if it's going to follow the Wine test standards. - $IsWineTest = ($StepNo != 1); + # If the user gave us an executable there is no telling + # if it is going going to follow the Wine test standards. + $IsWineTest = (defined $Step->PreviousNo and + $Job->Steps->GetItem($Step->PreviousNo)->FileType eq "patchdlls"); } elsif ($Step->Type eq "suite") {

1 0

Francois Gouget : testbot/WineRun*: Standardize a couple of TestBot error messages.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: tools Branch: master Commit: 2dccfa8243bf7d898cfef20aa2bfe6191837bf84 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2dccfa8243bf7d898cfef20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 26 15:07:35 2018 +0200 testbot/WineRun*: Standardize a couple of TestBot error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ff04ded..176ade6 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -458,7 +458,7 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) } elsif ($TA->GetLastError() !~ /: No such file or directory/) { - FatalTAError($TA, "Could not retrieve '$Local'"); + FatalTAError($TA, "An error occurred while retrieving '$Local'"); } } } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ff8aab9..f6bc8f1 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -481,7 +481,7 @@ elsif ($Step->Type eq "suite") Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) { - FatalTAError($TA, "Could not send the script to the VM"); + FatalTAError($TA, "Could not send the task script to the VM"); }

1 0

Francois Gouget : testbot: Rename the Makefiles patch impact to MakeMakefiles.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: tools Branch: master Commit: d7d1cf759402779fb3f7eaf16ec6c8c93c547b28 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d7d1cf759402779fb3f7eaf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 26 15:07:13 2018 +0200 testbot: Rename the Makefiles patch impact to MakeMakefiles. This makes it clearer that it does not mean a makefile was modified, but that the make_makefiles script should be rerun. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 +- testbot/bin/build/WineTest.pl | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 4df1070..a3cb170 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -103,7 +103,7 @@ sub ApplyPatch($) } my $Impacts = GetPatchImpact($PatchFile, "nounits"); - if ($Impacts->{Makefiles}) + if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 01396f9..032ee46 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -100,7 +100,7 @@ sub ApplyPatch($) } my $Impacts = GetPatchImpact($PatchFile, "nounits"); - if ($Impacts->{Makefiles}) + if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index c37a1d3..b2bfe6a 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -178,7 +178,7 @@ sub _HandleFile($$$) if ($Change eq "new" or $Change eq "rm") { # This adds / removes a directory - $Impacts->{Makefiles} = 1; + $Impacts->{MakeMakefiles} = 1; } return; } @@ -216,7 +216,7 @@ sub _HandleFile($$$) { # This may or may not be a Wine patch but the new Makefile.in will be # added to the build by make_makefiles. - $Impacts->{WineBuild} = $Impacts->{Makefiles} = 1; + $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; } } } @@ -289,7 +289,7 @@ sub GetPatchImpact($;$$) } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{WineBuild} = $Impacts->{Makefiles} = 1; + $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- /dev/null$=)

1 0

Francois Gouget : testbot/web: Adjust the GetFile MIME type based on Step- >FileType.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: tools Branch: master Commit: 6dde8de8257a1333a8951a0e6cd11f5f41e01d80 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6dde8de8257a1333a8951a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 26 13:40:47 2018 +0200 testbot/web: Adjust the GetFile MIME type based on Step->FileType. This lets the browser offer to open the patches in a text editor instead of systematically suggesting to save them to disk. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetFile.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 7e274a8..1fe1407 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -84,9 +84,11 @@ sub GetFile($$$) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); - - # Binary file - $Request->content_type("application/octet-stream"); + + # Text or binary file + my $MIME = $Step->FileType eq "patchdlls" ? "text/plain" : + "application/octet-stream"; + $Request->content_type($MIME); $Request->headers_out->add("Content-Disposition", 'attachment; filename="' . $Step->FileName . '"');

1 0

Francois Gouget : testbot/WineSendLog: Add proper command line handling and options.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: tools Branch: master Commit: 3941605cb602151e668db028c6e41c784cfb4cc9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3941605cb602151e668db02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 26 13:29:25 2018 +0200 testbot/WineSendLog: Add proper command line handling and options. When run in --debug mode WineSendLog prints the emails it would normally send instead of piping them to sendmail. Also the script now prints the error messages to stderr by default to make it easier to figure things out when running it on the command line. The --log-only option can be used when that's not desired. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- testbot/bin/WineSendLog.pl | 193 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 164 insertions(+), 31 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ce35094..464b6db 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -320,7 +320,7 @@ sub HandleJobStatusChange($$$) CloseAllDBBackEnds(); WineTestBot::Log::SetupRedirects(); - exec("$BinDir/${ProjectName}SendLog.pl $JobKey") or + exec("$BinDir/${ProjectName}SendLog.pl --log-only $JobKey") or LogMsg "Unable to exec ${ProjectName}SendLog.pl: $!\n"; exit(1); } diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index e03395a..ed3453b 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -36,14 +36,47 @@ sub BEGIN unshift @INC, "$::RootDir/lib"; } } +my $Name0 = $0; +$Name0 =~ s+^.*/++; + use Algorithm::Diff; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::StepsTasks; +# +# Logging and error handling helpers +# + +my $Debug; +sub Debug(@) +{ + print STDERR @_ if ($Debug); +} + +sub DebugTee($@) +{ + my ($File) = shift; + print $File @_; + Debug(@_); +} + +my $LogOnly; +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + +# +# Log analysis +# + sub IsBotFailure($) { my ($ErrLine) = @_; @@ -121,7 +154,7 @@ sub ReadLog($$$) } else { - LogMsg "Unable to open '$LogName' for reading: $!\n"; + Error "Unable to open '$LogName' for reading: $!\n"; } return \@Messages; @@ -179,7 +212,19 @@ sub SendLog($) my $StepsTasks = CreateStepsTasks(undef, $Job); my @SortedKeys = sort @{$StepsTasks->GetKeys()}; - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + # + # Send a job summary and all the logs as attachments to the developer + # + + Debug("-------------------- Developer email --------------------\n"); + if ($Debug) + { + open(SENDMAIL, ">>&=", 1); + } + else + { + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + } print SENDMAIL "From: $RobotEMail\n"; print SENDMAIL "To: $To\n"; my $Subject = "TestBot job " . $Job->Id . " results"; @@ -218,6 +263,7 @@ EOF $TestFailures; } + # Print the job summary my @FailureKeys; foreach my $Key (@SortedKeys) { @@ -322,6 +368,7 @@ EOF } } + # Print the log attachments foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); @@ -334,6 +381,7 @@ Content-Transfer-Encoding: 8bit EOF print SENDMAIL "Content-Disposition: attachment; filename=", $StepTask->VM->Name, ".log\n\n"; + print SENDMAIL "Not dumping logs in debug mode\n" if ($Debug); my $PrintSeparator = !1; my $TaskDir = $StepTask->GetTaskDir(); @@ -343,7 +391,7 @@ EOF while (defined($Line = <LOGFILE>)) { $Line =~ s/\s*$//; - print SENDMAIL "$Line\n"; + print SENDMAIL "$Line\n" if (!$Debug); $PrintSeparator = 1; } close LOGFILE; @@ -356,11 +404,11 @@ EOF { if ($PrintSeparator) { - print SENDMAIL "\n"; + print SENDMAIL "\n" if (!$Debug); $PrintSeparator = !1; } $Line =~ s/\s*$//; - print SENDMAIL "$Line\n"; + print SENDMAIL "$Line\n" if (!$Debug); } close ERRFILE; } @@ -369,10 +417,12 @@ EOF print SENDMAIL "--==13F70BD1-BA1B-449A-9CCB-B6A8E90CED47==--\n"; close(SENDMAIL); - if (! defined($Job->Patch)) - { - return; - } + # This is all for jobs submitted from the website + return if (!defined $Job->Patch); + + # + # Build a job summary with only the new errors + # my $Messages = ""; foreach my $Key (@FailureKeys) @@ -401,7 +451,7 @@ EOF } else { - LogMsg "BotFailure found in ${LatestName}.err\n"; + Error "BotFailure found in ${LatestName}.err\n"; } if ($MessagesFromErr || $MessagesFromLog) { @@ -411,15 +461,28 @@ EOF } elsif ($BotFailure) { - LogMsg "BotFailure found in $TaskDir/err\n"; + Error "BotFailure found in $TaskDir/err\n"; } } + # + # Send a summary of the new errors to the mailing list + # + + Debug("\n-------------------- Mailing list email --------------------\n"); + my $WebSite = ($UseSSL ? "https://" : "http://") . $WebHostName; if ($Messages) { - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + if ($Debug) + { + open(SENDMAIL, ">>&=", 1); + } + else + { + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + } print SENDMAIL "From: $RobotEMail\n"; print SENDMAIL "To: $To\n"; print SENDMAIL "Cc: $WinePatchCc\n"; @@ -445,6 +508,14 @@ EOF print SENDMAIL $Messages; close SENDMAIL; } + else + { + Debug("Found no error to report to the mailing list\n"); + } + + # + # Create a .testbot file for the patches website + # my $Patch = $Job->Patch; if (defined $Patch->WebPatchId and -d "$DataDir/webpatches") @@ -452,9 +523,12 @@ EOF my $BaseName = "$DataDir/webpatches/" . $Patch->WebPatchId; if (open (my $result, ">", "$BaseName.testbot")) { - print $result "Status: " . ($Messages ? "Failed" : "OK") . "\n"; - print $result "Job-ID: " . $Job->Id . "\n"; - print $result "URL: $WebSite/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; + Debug("\n-------------------- WebPatches report --------------------\n"); + # Only take into account new errors to decide whether the job was + # successful or not. + DebugTee($result, "Status: ". ($Messages ? "Failed" : "OK") ."\n"); + DebugTee($result, "Job-ID: ". $Job->Id ."\n"); + DebugTee($result, "URL: $WebSite/JobDetails.pl?Key=". $Job->GetKey() ."\n"); foreach my $Key (@SortedKeys) { @@ -496,7 +570,7 @@ EOF } else { - LogMsg "Job " . $Job->Id . ": Unable to open '$BaseName.testbot' for writing: $!"; + Error "Job ". $Job->Id .": Unable to open '$BaseName.testbot' for writing: $!"; } } } @@ -509,37 +583,96 @@ EOF $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; -my $JobId = $ARGV[0]; -if (! $JobId) +my $Usage; +sub ValidateNumber($$) +{ + my ($Name, $Value) = @_; + + # Validate and untaint the value + return $1 if ($Value =~ /^(\d+)$/); + Error "$Value is not a valid $Name\n"; + $Usage = 2; + return undef; +} + +my ($JobId); +while (@ARGV) { - die "Usage: WineSendLog.pl JobId"; + my $Arg = shift @ARGV; + if ($Arg eq "--debug") + { + $Debug = 1; + } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + elsif ($Arg =~ /^-/) + { + Error "unknown option '$Arg'\n"; + $Usage = 2; + last; + } + elsif (!defined $JobId) + { + $JobId = ValidateNumber('job id', $Arg); + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } } -# Untaint parameters -if ($JobId =~ /^(\d+)$/) +# Check parameters +if (!defined $Usage) { - $JobId = $1; + if (!defined $JobId) + { + Error "you must specify the job id\n"; + $Usage = 2; + } } -else +if (defined $Usage) { - LogMsg "Invalid JobId $JobId\n"; - exit(1); + if ($Usage) + { + Error "try '$Name0 --help' for more information\n"; + exit $Usage; + } + print "Usage: $Name0 [--debug] [--help] JOBID\n"; + print "\n"; + print "Analyze the job's logs and notifies the developer and the patches website.\n"; + print "\n"; + print "Where:\n"; + print " JOBID Id of the job to report on.\n"; + print " --debug More verbose messages for debugging.\n"; + print " --log-only Only send error messages to the log instead of also printing them\n"; + print " on stderr.\n"; + print " --help Shows this usage message.\n"; + exit 0; } my $Job = CreateJobs()->GetItem($JobId); -if (! defined($Job)) +if (!defined $Job) { - LogMsg "Job $JobId doesn't exist\n"; - exit(1); + Error "Job $JobId doesn't exist\n"; + exit 1; } # -# Analyze the log and notify the developer +# Analyze the log, notify the developer and the Patches website # SendLog($Job); LogMsg "Log for job $JobId sent\n"; -exit(0); +exit 0;

1 0

Francois Gouget : testbot: Move log line categorization to LogUtils and simplify line highlighting.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: tools Branch: master Commit: b53aafbc9281d0b202fa5a7dc0b4682b2f21dfe9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b53aafbc9281d0b202fa5a7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 26 13:23:25 2018 +0200 testbot: Move log line categorization to LogUtils and simplify line highlighting. GetLogLineCategory() identifies log lines of interest which makes it possible to decide how to display them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 61 ++++++++++++++++++++++++++++- testbot/web/JobDetails.pl | 78 +++++++++++++------------------------ 2 files changed, 88 insertions(+), 51 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3e40fbc..daa9c0b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,7 +27,7 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(ParseTaskLog); +our @EXPORT = qw(GetLogLineCategory ParseTaskLog); # @@ -74,4 +74,63 @@ sub ParseTaskLog($$) return "nolog:Unable to open the task log for reading: $!"; } + +# +# Log querying and formatting +# + +=pod +=over 12 + +=item C<GetLogLineCategory()> + +Identifies the category of the given log line: an error message, a todo, just +an informational message or none of these. The category can then be used to +decide whether to hide the line or, on the contrary, highlight it. + +=back +=cut + +sub GetLogLineCategory($) +{ + my ($Line) = @_; + + if ($Line =~ /: Test marked todo: /) + { + return "todo"; + } + if ($Line =~ /: Tests skipped: / or + $Line =~ /^\w+:\w+ skipped /) + { + return "skip"; + } + if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or + $Line =~ /Fatal: test .* does not exist/ or + $Line =~ / done $258$/ or + $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or + $Line =~ /^Unhandled exception: / or + # Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or + # Build errors + $Line =~ /: error: / or + $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or + # Typical perl errors + $Line =~ /^Use of uninitialized value/) + { + return "error"; + } + if ($Line =~ /^\+ \S/ or + $Line =~ /^\w+:\w+ start / or + # Build messages + $Line =~ /^(?:Build|Reconfig|Task): ok/) + { + return "info"; + } + + return "none"; +} + 1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index f05c0f6..07924f4 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -28,6 +28,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::LogUtils; use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; @@ -228,59 +229,36 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } +=pod +=over 12 + +=item C<GetHtmlLine()> + +Determines if the log line should be shown, how, and escapes it so it is valid +HTML. + +When not showing the full log, returns undef except for error messages which +are the only lines tha should be shown. +When showing the full log error messages and other lines of interest are +highlighted to make the log more readable. + +=back +=cut + sub GetHtmlLine($$$) { my ($self, $FullLog, $Line) = @_; - $Line = $self->escapeHTML($Line); - if ($Line =~ /: Test marked todo: /) - { - return (undef, $Line) if (!$FullLog); - my $Html = $Line; - $Html =~ s~^(.*\S)\s*\r?$~$1~; - return ($Html, $Line); - } - if ($Line =~ /: Tests skipped: / or - $Line =~ /^\w+:\w+ skipped /) - { - return (undef, $Line) if (!$FullLog); - my $Html = $Line; - $Html =~ s~^(.*\S)\s*\r?$~$1~; - return ($Html, $Line); - } - if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or - $Line =~ /Fatal: test .* does not exist/ or - $Line =~ / done $258$/ or - $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or - $Line =~ /^Unhandled exception: / or - # Git errors - $Line =~ /^CONFLICT / or - $Line =~ /^error: patch failed:/ or - $Line =~ /^error: corrupt patch / or - # Build errors - $Line =~ /: error: / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or - # Typical perl errors - $Line =~ /^Use of uninitialized value/) - { - return ($Line, $Line) if (!$FullLog); - my $Html = $Line; - $Html =~ s~^(.*\S)\s*\r?$~$1~; - return ($Html, $Line); - } - if ($FullLog && - ($Line =~ /^\+ \S/ or - $Line =~ /^\w+:\w+ start / or - # Build messages - $Line =~ /^(?:Build|Reconfig|Task): ok/)) + my $Category = GetLogLineCategory($Line); + return undef if ($Category ne "error" and !$FullLog); + + my $Html = $self->escapeHTML($Line); + if ($FullLog and $Category ne "none") { - my $Html = $Line; - $Html =~ s~^(.*\S)\s*\r?$~$1~; - return ($Html, $Line); + # Highlight all line categories in the full log + $Html =~ s~^(.*\S)\s*\r?$~$1~; } - - return (undef, $Line); + return $Html; } my @MILogFiles = qw(exe32.report exe64.report log log.old); @@ -429,8 +407,8 @@ sub GenerateBody($) { $CurrentDll = $1; } - my ($Highlight, $Plain) = $self->GetHtmlLine($MoreInfo->{Full}, $Line); - next if (!$MoreInfo->{Full} and !defined $Highlight); + my $Html = $self->GetHtmlLine($MoreInfo->{Full}, $Line); + next if (!defined $Html); if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) { @@ -451,7 +429,7 @@ sub GenerateBody($) } else { - print(($Highlight || $Plain), "\n"); + print "$Html\n"; } } close($LogFile);

1 0

Alexandre Julliard : Wine release 3.0.2
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: website Branch: master Commit: 57bcdcbe149582c0e1898c5eee80692cd0bd13c2 URL: https://source.winehq.org/git/website.git/?a=commit;h=57bcdcbe149582c0e1898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 11:44:37 2018 +0200 Wine release 3.0.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018062601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018062601.xml b/news/en/2018062601.xml new file mode 100644 index 0000000..170cd10 --- /dev/null +++ b/news/en/2018062601.xml @@ -0,0 +1,12 @@ +<news> +<date>June 26, 2018</date> +<title>Wine 3.0.2 Released</title> +<body> + The Wine maintenance release 3.0.2 is now available. + <a href="{$root}/announce/3.0.2">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

André Hentschel : gdiplus: Add stub for GdipSetPathGradientPath.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 00081e51780233e8da635d0b4560c8f8e273dded URL: https://source.winehq.org/git/wine.git/?a=commit;h=00081e51780233e8da635d0b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 26 20:09:37 2018 +0200 gdiplus: Add stub for GdipSetPathGradientPath. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e7b16bcb577fd38a1e13f1e0efc7f8a91a2ab240) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/brush.c | 12 ++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 26e3419..0114a51 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1686,6 +1686,18 @@ GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientPath(GpPathGradient *grad, GDIPCONST GpPath *path) +{ + static int calls; + + TRACE("(%p, %p)\n", grad, path); + + if (!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, REAL focus, REAL scale) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 25b27e7..e0cf6d5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -534,7 +534,7 @@ 534 stdcall GdipSetPathGradientFocusScales(ptr float float) 535 stdcall GdipSetPathGradientGammaCorrection(ptr long) 536 stdcall GdipSetPathGradientLinearBlend(ptr float float) -537 stub GdipSetPathGradientPath +537 stdcall GdipSetPathGradientPath(ptr ptr) 538 stdcall GdipSetPathGradientPresetBlend(ptr ptr ptr long) 539 stdcall GdipSetPathGradientSigmaBlend(ptr float float) 540 stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f766441..628db82 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -589,6 +589,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient*,GpPoint*); GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL); +GpStatus WINGDIPAPI GdipSetPathGradientPath(GpPathGradient*,GDIPCONST GpPath*); GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, GDIPCONST ARGB*,INT*);

1 0

Zebediah Figura : devenum: Correctly implement IMoniker::GetDisplayName().
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: a1d42aca46d03f60ba47a8071bae6eac30dbd641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d42aca46d03f60ba47a807… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:10 2018 -0600 devenum: Correctly implement IMoniker::GetDisplayName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b0300ce56483fb2f2a03de8aa216d41b0bfd034e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/devenum_private.h | 1 + dlls/devenum/mediacatenum.c | 51 ++++++++++++++++++++++++++++++++---------- dlls/devenum/tests/devenum.c | 4 ++-- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 9a0b5ad..83d0ce3 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -95,6 +95,7 @@ static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'A','c','t','i','v','e','M','o','v','i','e','\\', 'd','e','v','e','n','u','m','\\',0}; +static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 0f38a0e..0d4e01e 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); typedef struct { IEnumMoniker IEnumMoniker_iface; + CLSID class; LONG ref; HKEY sw_key; DWORD sw_index; @@ -621,24 +622,35 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_RelativePathTo(IMoniker *iface, I static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) { + static const WCHAR swW[] = {'s','w',':',0}; + static const WCHAR cmW[] = {'c','m',':',0}; MediaCatMoniker *This = impl_from_IMoniker(iface); - WCHAR wszBuffer[MAX_PATH]; - static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; - DWORD received = sizeof(wszBuffer); + WCHAR *buffer; TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, ppszDisplayName); *ppszDisplayName = NULL; - /* FIXME: should this be the weird stuff we have to parse in IParseDisplayName? */ - if (RegQueryValueExW(This->hkey, wszFriendlyName, NULL, NULL, (LPBYTE)wszBuffer, &received) == ERROR_SUCCESS) + buffer = CoTaskMemAlloc((strlenW(deviceW) + 4 + (This->has_class ? CHARS_IN_GUID : 0) + + strlenW(This->name) + 1) * sizeof(WCHAR)); + if (!buffer) + return E_OUTOFMEMORY; + + strcpyW(buffer, deviceW); + if (This->type == DEVICE_FILTER) + strcatW(buffer, swW); + else if (This->type == DEVICE_CODEC) + strcatW(buffer, cmW); + + if (This->has_class) { - *ppszDisplayName = CoTaskMemAlloc(received); - strcpyW(*ppszDisplayName, wszBuffer); - return S_OK; + StringFromGUID2(&This->class, buffer + strlenW(buffer), CHARS_IN_GUID); + strcatW(buffer, backslashW); } + strcatW(buffer, This->name); - return E_FAIL; + *ppszDisplayName = buffer; + return S_OK; } static HRESULT WINAPI DEVENUM_IMediaCatMoniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, @@ -782,6 +794,11 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, This->sw_index++; if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; + + if (!(pMoniker = DEVENUM_IMediaCatMoniker_Construct())) + return E_OUTOFMEMORY; + + pMoniker->type = DEVICE_FILTER; } /* then try codecs */ else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) @@ -790,14 +807,23 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, if ((res = RegOpenKeyExW(This->cm_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; + + if (!(pMoniker = DEVENUM_IMediaCatMoniker_Construct())) + return E_OUTOFMEMORY; + + pMoniker->type = DEVICE_CODEC; } else break; - pMoniker = DEVENUM_IMediaCatMoniker_Construct(); - if (!pMoniker) + if (!(pMoniker->name = CoTaskMemAlloc((strlenW(buffer) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&pMoniker->IMoniker_iface); return E_OUTOFMEMORY; - + } + strcpyW(pMoniker->name, buffer); + pMoniker->has_class = TRUE; + pMoniker->class = This->class; pMoniker->hkey = hkey; rgelt[fetched] = &pMoniker->IMoniker_iface; @@ -887,6 +913,7 @@ HRESULT create_EnumMoniker(REFCLSID class, IEnumMoniker **ppEnumMoniker) pEnumMoniker->ref = 1; pEnumMoniker->sw_index = 0; pEnumMoniker->cm_index = 0; + pEnumMoniker->class = *class; strcpyW(buffer, clsidW); StringFromGUID2(class, buffer + strlenW(buffer), CHARS_IN_GUID); diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index d665df3..d9a799c 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -306,10 +306,8 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR ok_(__FILE__, line)(hr == S_OK, "ParseDisplayName failed: %#x\n", hr); hr = IMoniker_GetDisplayName(mon, NULL, NULL, &str); -todo_wine { ok_(__FILE__, line)(hr == S_OK, "GetDisplayName failed: %#x\n", hr); ok_(__FILE__, line)(!lstrcmpW(str, buffer), "got %s\n", wine_dbgstr_w(str)); -} CoTaskMemFree(str); @@ -341,6 +339,7 @@ static void test_directshow_filter(void) mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ +todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); @@ -439,6 +438,7 @@ static void test_codec(void) mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ +todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag);

1 0