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

[PATCH] kernel32: GetCalendarInfoW gets character sizes
by Marcus Meissner 26 Jun '18

26 Jun '18

found by grep Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/kernel32/tests/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index e6e779c703..8bbad2b8a2 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -697,7 +697,7 @@ static void test_GetCalendarInfo(void) ok( ret == 5, "wrong size %u\n", ret ); ok( atoi( bufferA ) == val1, "wrong value %s/%u\n", bufferA, val1 ); - ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, bufferW, sizeof(bufferW), NULL ); + ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, bufferW, ARRAY_SIZE(bufferW), NULL ); ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); ok( ret == 5, "wrong size %u\n", ret ); memset( bufferA, 0x55, sizeof(bufferA) ); @@ -731,7 +731,7 @@ static void test_GetCalendarInfo(void) ok( ret == ret2, "got %d, expected %d\n", ret2, ret ); ret2 = pGetCalendarInfoW( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, - bufferW, sizeof(bufferW), NULL); + bufferW, ARRAY_SIZE(bufferW), NULL); ok( ret2, "GetCalendarInfoW failed err %u\n", GetLastError() ); ret2 = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); ok( ret == ret2, "got %d, expected %d\n", ret, ret2 ); -- 2.17.1

1 0

[PATCH 4/5] winmm: Make TIME_TICKS position continuous.
by Akihiro Sagawa 26 Jun '18

26 Jun '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-)

1 0

[PATCH 3/5] winmm/tests: Add more MIDI stream position tests.
by Akihiro Sagawa 26 Jun '18

26 Jun '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

1 0

[PATCH] testbot/WineRunTask: Better detect standard Wine tests.
by Francois Gouget 26 Jun '18

26 Jun '18

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> --- 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 ff8aab9f4..9fa263eea 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") { -- 2.18.0

1 0

[PATCH] testbot/WineRun*: Standardize a couple of TestBot error messages.
by Francois Gouget 26 Jun '18

26 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- 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 ff04ded0c..176ade6b6 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 9fa263eea..9faae28c3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -482,7 +482,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"); } -- 2.18.0

1 0

[PATCH] testbot: Rename the Makefiles patch impact to MakeMakefiles.
by Francois Gouget 26 Jun '18

26 Jun '18

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> --- 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 4df107005..a3cb170a0 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 01396f9bf..032ee4640 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 c37a1d3ab..b2bfe6a9a 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$=) -- 2.18.0

1 0

[PATCH] testbot/web: Adjust the GetFile MIME type based on Step->FileType.
by Francois Gouget 26 Jun '18

26 Jun '18

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> --- Not an urgent or very important patch but I believe it will make some people pretty happy. 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 7e274a8bf..1fe140788 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 . '"'); -- 2.18.0

1 0

[PATCH 1/7] testbot: Move log line categorization to LogUtils and simplify line highlighting.
by Francois Gouget 26 Jun '18

26 Jun '18

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> --- This makes it reusable in WineSendLog.pl. 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 3e40fbc35..daa9c0bd8 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 f05c0f62e..07924f4e6 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); -- 2.18.0

1 6

Re: [PATCH 2/2] msvcp120: Add test for Concurrent_vector_grow_to_at_least_with_result.
by Piotr Caban 26 Jun '18

26 Jun '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

Re: [PATCH 1/2] msvcp120: Add test for Concurrent_vector_grow_by.
by Piotr Caban 26 Jun '18

26 Jun '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0