wine-devel June 2018

wine-devel@winehq.org

68 participants
583 discussions

[PATCH] winetest: Don't show dll=skipped messages for skipped tests.
by Francois Gouget 20 Jun '18

20 Jun '18

This spams the report when using WineTest to run a few tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index bfac17bdf6e..b3c3c1c8502 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -902,7 +902,6 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP if (test_filtered_out( lpszName, NULL )) { nr_of_skips++; - xprintf (" %s=skipped\n", dllname); return TRUE; } extract_test (&wine_tests[nr_of_files], tempdir, lpszName); -- 2.17.1

1 0

[PATCH 1/2] testbot/web: Allow showing multiple job screenshots and logs.
by Francois Gouget 20 Jun '18

20 Jun '18

It's now possible to have the job details page show multiple screenshots and multiple logs. Once a screenshot / log is shown, the link can be clicked again to hide it. The code can also more easily be extended to handle more log files. The code inserting the links is simpler too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 2 +- testbot/web/JobDetails.pl | 156 +++++++++++++++++++++++-------------- 2 files changed, 97 insertions(+), 61 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3d8113fd9..c4ca578e2 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -448,7 +448,7 @@ elsif ($Step->Type eq "suite") if (defined($WebHostName)) { my $StepTask = 100 * $StepNo + $TaskNo; - $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&scrshot_$StepTask=1#k$StepTask\""; + $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\""; } my $Info = $VM->Description ? $VM->Description : ""; if ($VM->Details) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 70d8b5983..f829407eb 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -228,12 +228,95 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } +my %MILogLabels = ( + "log" => "task log", + "log.old" => "old logs", +); + +sub InitMoreInfo($) +{ + my ($self) = @_; + + my $More = $self->{More} = {}; + my $Keys = $self->SortKeys(undef, $self->{Collection}->GetKeys()); + foreach my $Key (@$Keys) + { + my $StepTask = $self->{Collection}->GetItem($Key); + $More->{$Key}->{Screenshot} = $self->GetParam("s$Key"); + + my $Value = $self->GetParam("f$Key"); + my $TaskDir = $StepTask->GetTaskDir(); + foreach my $Log ("log", "log.old") + { + if (!-f "$TaskDir/$Log" or -z "$TaskDir/$Log") + { + my $Err = $Log; + next if ($Err !~ s/^log/err/ or !-f "$TaskDir/$Err" or -z "$TaskDir/$Err"); + } + push @{$More->{$Key}->{Logs}}, $Log; + + $More->{$Key}->{Full} = $Log if (uri_escape($Log) eq $Value); + } + $More->{$Key}->{Full} ||= ""; + } +} + +sub GenerateMoreInfoLink($$$;$) +{ + my ($self, $LinkKey, $Label, $Set, $Value) = @_; + + my $Url = $ENV{"SCRIPT_NAME"} ."?Key=". uri_escape($self->{JobId}); + + my $Action = "Show"; + foreach my $Key (sort keys %{$self->{More}}) + { + my $MoreInfo = $self->{More}->{$Key}; + if ($Key eq $LinkKey and $Set eq "Screenshot") + { + if (!$MoreInfo->{Screenshot}) + { + $Url .= "&s$Key=1"; + } + else + { + $Action = "Hide"; + } + } + else + { + $Url .= "&s$Key=1" if ($MoreInfo->{Screenshot}); + } + + if ($Key eq $LinkKey and $Set eq "Full") + { + if ($MoreInfo->{Full} ne $Value) + { + $Url .= "&f$Key=". uri_escape($Value); + } + else + { + $Action = "Hide"; + } + } + else + { + $Url .= "&f$Key=". uri_escape($MoreInfo->{Full}) if ($MoreInfo->{Full}); + } + } + $Url .= "#k" . uri_escape($LinkKey); + + print "<div class='TaskMoreInfoLink'><a href='", + $self->CGI->escapeHTML($Url), "'>$Action $Label</a></div>\n"; +} + sub GenerateBody($) { my ($self) = @_; $self->SUPER::GenerateBody(); + $self->InitMoreInfo(); + print "<div class='Content'>\n"; my $Keys = $self->SortKeys(undef, $self->{Collection}->GetKeys()); foreach my $Key (@$Keys) @@ -249,18 +332,11 @@ sub GenerateBody($) $self->CGI->escapeHTML($VM->Details || "No details!"), "</details>\n"; - my $FullLogParamName = "log_$Key"; - my $FullLog = $self->GetParam($FullLogParamName); - $FullLog = "" if ($FullLog !~ /^[12]$/); - - my $ScreenshotParamName = "scrshot_$Key"; - my $Screenshot = $self->GetParam($ScreenshotParamName); - $Screenshot = "" if ($Screenshot ne "1"); - + my $MoreInfo = $self->{More}->{$Key}; print "<div class='TaskMoreInfoLinks'>\n"; if (-r "$TaskDir/screenshot.png") { - if ($Screenshot) + if ($MoreInfo->{Screenshot}) { my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo) . @@ -268,59 +344,19 @@ sub GenerateBody($) print "<div class='Screenshot'><img src='" . $self->CGI->escapeHTML($URI) . "' alt='Screenshot' /></div>\n"; } - else - { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . - "&$ScreenshotParamName=1"; - $URI .= "&$FullLogParamName=$FullLog"; - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show final screenshot</a></div>"; - print "\n"; - } + $self->GenerateMoreInfoLink($Key, "final screenshot", "Screenshot"); } - my $LogName = "$TaskDir/log"; - my $ErrName = "$TaskDir/err"; - if (-r $LogName and $FullLog != "1") - { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . - "&$FullLogParamName=1"; - $URI .= "&$ScreenshotParamName=$Screenshot"; - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show full log</a></div>\n"; - } - if ((-r $LogName or -r $ErrName) and $FullLog == "2") + foreach my $Log (@{$MoreInfo->{Logs}}) { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}); - $URI .= "&$ScreenshotParamName=$Screenshot"; - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show latest log</a></div>\n"; - } - if ((-r "$LogName.old" or -r "$ErrName.old") and $FullLog != "2") - { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . - "&$FullLogParamName=2"; - $URI .= "&$ScreenshotParamName=$Screenshot"; - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show old logs</a></div>\n"; + $self->GenerateMoreInfoLink($Key, $MILogLabels{$Log}, "Full", $Log); } print "</div>\n"; - if ($FullLog eq "2") - { - $LogName .= ".old"; - $ErrName .= ".old"; - } + my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; + my $ErrName = $LogName eq "log.old" ? "err.old" : "err"; - if (open LOGFILE, "<$LogName") + if (open LOGFILE, "<", "$TaskDir/$LogName") { my $HasLogEntries = !1; my $First = 1; @@ -335,13 +371,13 @@ sub GenerateBody($) { $CurrentDll = $1; } - if ($FullLog || + if ($MoreInfo->{Full} || $Line =~ m/: Test (?:failed|succeeded inside todo block): / || $Line =~ m/Fatal: test '[^']+' does not exist/ || $Line =~ m/ done $258$/ || $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /) { - if ($PrintedDll ne $CurrentDll && ! $FullLog) + if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) { if ($First) { @@ -359,7 +395,7 @@ sub GenerateBody($) print "<pre><code>"; $First = !1; } - if (! $FullLog && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + if (!$MoreInfo->{Full} && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) { my $Unit = $1 ne "" ? "$1: " : ""; print "${Unit}Timeout\n"; @@ -372,7 +408,7 @@ sub GenerateBody($) } close LOGFILE; - if (open ERRFILE, "<$ErrName") + if (open ERRFILE, "<", "$TaskDir/$ErrName") { $CurrentDll = "*err*"; while (defined($Line = <ERRFILE>)) @@ -409,7 +445,7 @@ sub GenerateBody($) " failures found" : "Empty log"; } } - elsif (open ERRFILE, "<$ErrName") + elsif (open ERRFILE, "<", "$TaskDir/$ErrName") { my $HasErrEntries = !1; my $Line; -- 2.17.1

1 1

[PATCH 1/4] testbot: Add section headers and reorder the Utils.pm functions.
by Francois Gouget 20 Jun '18

20 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 100 +++++++++++++++++-------------- 1 file changed, 54 insertions(+), 46 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 81a2eda39..8b0bfeb0c 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -35,6 +35,10 @@ use Fcntl; use WineTestBot::Config; +# +# Web helpers +# + sub MakeSecureURL($) { my ($URL) = @_; @@ -53,6 +57,56 @@ sub SecureConnection() return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; } +sub DurationToString($;$) +{ + my ($Secs, $Raw) = @_; + + return "n/a" if (!defined $Secs); + + my @Parts; + if (!$Raw) + { + my $Mins = int($Secs / 60); + $Secs -= 60 * $Mins; + my $Hours = int($Mins / 60); + $Mins -= 60 * $Hours; + my $Days = int($Hours / 24); + $Hours -= 24 * $Days; + push @Parts, "${Days}d" if ($Days); + push @Parts, "${Hours}h" if ($Hours); + push @Parts, "${Mins}m" if ($Mins); + } + if (!@Parts or int($Secs) != 0) + { + push @Parts, (@Parts or int($Secs) == $Secs) ? + int($Secs) ."s" : + sprintf('%.1fs', $Secs); + } + return join(" ", @Parts); +} + +sub BuildEMailRecipient($$) +{ + my ($EMailAddress, $Name) = @_; + + if (! defined($EMailAddress)) + { + return undef; + } + my $Recipient = "<" . $EMailAddress . ">"; + if ($Name) + { + $Recipient .= " ($Name)"; + } + + return $Recipient; +} + + +# +# Temporary file helpers +# + sub GenerateRandomString($) { my ($Len) = @_; @@ -119,50 +173,4 @@ sub CreateNewDir($$) } } -sub DurationToString($;$) -{ - my ($Secs, $Raw) = @_; - - return "n/a" if (!defined $Secs); - - my @Parts; - if (!$Raw) - { - my $Mins = int($Secs / 60); - $Secs -= 60 * $Mins; - my $Hours = int($Mins / 60); - $Mins -= 60 * $Hours; - my $Days = int($Hours / 24); - $Hours -= 24 * $Days; - push @Parts, "${Days}d" if ($Days); - push @Parts, "${Hours}h" if ($Hours); - push @Parts, "${Mins}m" if ($Mins); - } - if (!@Parts or int($Secs) != 0) - { - push @Parts, (@Parts or int($Secs) == $Secs) ? - int($Secs) ."s" : - sprintf('%.1fs', $Secs); - } - return join(" ", @Parts); -} - -sub BuildEMailRecipient($$) -{ - my ($EMailAddress, $Name) = @_; - - if (! defined($EMailAddress)) - { - return undef; - } - my $Recipient = "<" . $EMailAddress . ">"; - if ($Name) - { - $Recipient .= " ($Name)"; - } - - return $Recipient; -} - - 1; -- 2.17.1

1 3

[PATCH] testbot/WineRunTask: Trace the effective timeout, with leeway.
by Francois Gouget 20 Jun '18

20 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 4fd51d985..51b105b19 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -493,7 +493,7 @@ if (!$Pid) my $NewStatus = 'completed'; my ($TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); -Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); +Debug(Elapsed($Start), " Waiting for the script (", $Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) { my $ErrMessage = $TA->GetLastError(); -- 2.17.1

1 0

[PATCH] testbot: Retrieve the list of Wine files.
by Francois Gouget 20 Jun '18

20 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index fe69fc3b7..d04b78061 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -444,6 +444,16 @@ if ($NewStatus eq "completed") { $TAError = "An error occurred while retrieving the test list: ". $TA->GetLastError(); } + + Debug(Elapsed($Start), " Retrieving the list of Wine files '$TaskDir/winefiles.txt'\n"); + if ($TA->GetFile("latest/winefiles.txt", "$TaskDir/winefiles.txt")) + { + copy "$TaskDir/winefiles.txt", "$DataDir/latest/winefiles.txt"; + } + elsif (!defined $TAError) + { + $TAError = "An error occurred while retrieving the list of Wine files: ". $TA->GetLastError(); + } } $TA->Disconnect(); -- 2.17.1

1 0

[PATCH] testbot/WineRun*: Rename the timeout WrapUpAndExit() parameter.
by Francois Gouget 20 Jun '18

20 Jun '18

It is a boolean indicating whether the task timed out, not the timeout value in seconds. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index eab33bc08..1bc6cffbc 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -196,11 +196,11 @@ sub LogTaskError($) sub WrapUpAndExit($;$$) { - my ($Status, $Retry, $Timeout) = @_; + my ($Status, $Retry, $TimedOut) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; my $VMResult = $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : - $Timeout ? "timeout" : ""; + $TimedOut ? "timeout" : ""; my $TestFailures; my $Tries = $Task->TestFailures || 0; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index e7b447e92..fe69fc3b7 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -195,12 +195,12 @@ sub LogTaskError($) sub WrapUpAndExit($;$$) { - my ($Status, $Retry, $Timeout) = @_; + my ($Status, $Retry, $TimedOut) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : $Status eq 'completed' ? 'idle' : 'dirty'; my $VMResult = $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : - $Timeout ? "timeout" : ""; + $TimedOut ? "timeout" : ""; my $TestFailures; my $Tries = $Task->TestFailures || 0; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3b0ccbc4a..e10656ed8 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -226,11 +226,11 @@ sub LogTaskError($) sub WrapUpAndExit($;$$$) { - my ($Status, $TestFailures, $Retry, $Timeout) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; my $VMResult = $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : - $Timeout ? "timeout" : ""; + $TimedOut ? "timeout" : ""; Debug(Elapsed($Start), " Taking a screenshot\n"); TakeScreenshot($VM, "$TaskDir/screenshot.png"); -- 2.17.1

1 0

[PATCH] testbot/build: Detect patches that impact more than the tests.
by Francois Gouget 20 Jun '18

20 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 101 ++++++++++++++++---------- 2 files changed, 64 insertions(+), 39 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 3fe0e14ea..8318af12a 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -246,7 +246,7 @@ exit(1) if (!$Impacts); CountCPUs(); -if (!BuildNative()) +if ($Impacts->{WineBuild} and !BuildNative()) { exit(1); } diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 6eb8e3cd8..f83df6087 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -36,6 +36,23 @@ our @EXPORT = qw(GetPatchImpact UpdateWineData); use WineTestBot::Config; +# Patches to these paths don't impact the Wine build. So ignore them. +my $IgnoredPathsRe = join('|', + '\.mailmap$', + 'ANNOUNCE$', + 'AUTHORS$', + 'COPYING\.LIB$', + 'LICENSE\$', + 'LICENSE\.OLD$', + 'MAINTAINERS$', + 'README$', + 'VERSION$', + 'documentation/', + 'tools/c2man\.pl$', + 'tools/winapi/', + 'tools/winemaker/', +); + =pod =over 12 @@ -102,46 +119,54 @@ sub GetTestList() return $TestList; } -sub _AddTest($$$) +sub _HandleFile($$$) { my ($Impacts, $Path, $Change) = @_; - return if ($Path !~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~); - my ($Root, $Module, $File) = ($1, $2, $3); - - my $Tests = $Impacts->{Tests}; - if (!$Tests->{$Module}) + if ($Path =~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~) { - my $ExeBase = ($Root eq "programs") ? "${Module}.exe_test" : - "${Module}_test"; - $Tests->{$Module} = { - "Module" => $Module, - "Path" => "$Root/$Module/tests", - "ExeBase" => $ExeBase, - }; - } + my ($Root, $Module, $File) = ($1, $2, $3); + $Impacts->{TestBuild} = 1; - # Assume makefile modifications may break the build but not the tests - if ($File eq "Makefile.in") - { - if ($Change eq "new" or $Change eq "rm") + my $Tests = $Impacts->{Tests}; + if (!$Tests->{$Module}) { - # This adds / removes a directory - $Impacts->{Makefiles} = 1; + my $ExeBase = ($Root eq "programs") ? "${Module}.exe_test" : + "${Module}_test"; + $Tests->{$Module} = { + "Module" => $Module, + "Path" => "$Root/$Module/tests", + "ExeBase" => $ExeBase, + }; } - return; - } - return if ($Impacts->{NoUnits}); - if (!$Tests->{$Module}->{Files}) - { - my $TestList = ( $Impacts->{TestList} ||= GetTestList() ); - foreach my $File (keys %{$TestList->{$Module}}) + # Assume makefile modifications may break the build but not the tests + if ($File eq "Makefile.in") { - $Tests->{$Module}->{Files}->{$File} = 0; # not modified + if ($Change eq "new" or $Change eq "rm") + { + # This adds / removes a directory + $Impacts->{Makefiles} = 1; + } + return; } + return if ($Impacts->{NoUnits}); + + if (!$Tests->{$Module}->{Files}) + { + my $TestList = ( $Impacts->{TestList} ||= GetTestList() ); + foreach my $File (keys %{$TestList->{$Module}}) + { + $Tests->{$Module}->{Files}->{$File} = 0; # not modified + } + } + $Tests->{$Module}->{Files}->{$File} = $Change; + } + else + { + # Figure out if this patch impacts the Wine build + $Impacts->{WineBuild} = 1 if ($Path !~ /^(?:$IgnoredPathsRe)/); } - $Tests->{$Module}->{Files}->{$File} = $Change; } =pod @@ -176,8 +201,8 @@ sub GetPatchImpact($;$$) { foreach my $File (keys %{$PastInfo->{Files}}) { - _AddTest($Impacts, "$PastInfo->{Path}/$File", - $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); + _HandleFile($Impacts, "$PastInfo->{Path}/$File", + $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); } } } @@ -187,33 +212,33 @@ sub GetPatchImpact($;$$) { if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=) { - $Impacts->{Autoconf} = 1; + $Impacts->{WineBuild} = $Impacts->{Autoconf} = 1; } elsif ($Line =~ m=^--- \w+/configure$=) { - $Impacts->{HasConfigure} = 1; + $Impacts->{WineBuild} = $Impacts->{HasConfigure} = 1; } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{Makefiles} = 1; + $Impacts->{WineBuild} = $Impacts->{Makefiles} = 1; } elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new"; } - elsif ($Line =~ m~^--- \w+/([^/]+/[^/]+/tests/[^/\s]+)$~) + elsif ($Line =~ m~^--- \w+/([^\s]+)$~) { $Path = $1; } elsif ($Line =~ m~^\+\+\+ /dev/null$~) { - _AddTest($Impacts, $Path, "rm") if (defined $Path); + _HandleFile($Impacts, $Path, "rm") if (defined $Path); $Path = undef; $Change = ""; } - elsif ($Line =~ m~^\+\+\+ \w+/(\w+/[^/]+/tests/[^/\s]+)$~) + elsif ($Line =~ m~^\+\+\+ \w+/([^\s]+)$~) { - _AddTest($Impacts, $1, $Change || "modify"); + _HandleFile($Impacts, $1, $Change || "modify"); $Path = undef; $Change = ""; } -- 2.17.1

1 0

[PATCH] testbot: Adjust the reconfig timeout.
by Francois Gouget 20 Jun '18

20 Jun '18

$ReconfigTimeout was way overestimated, maybe reflecting a time when either the TestBot or the Wine dependencies were causing too many files to be rebuilt. Note that $BuildTimeout is a bit large too: a patch touching a test module and a core header would typically only require about 2.5 minutes. But in the unlikely event where that patch touched dozens of test modules it may still be too short. So $BuildTimeout is left unchanged. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Config.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b7d633db6..66cb813ff 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -97,9 +97,10 @@ $SingleTimeout = 2 * 60; # How long to let a regular build run before forcibly shutting it down # (in seconds). $BuildTimeout = 5 * 60; -# How long to let a full recompilation run before forcibly shutting it down -# (in seconds). -$ReconfigTimeout = 45 * 60; +# How long to let a reconfig task run before forcibly shutting it down +# (in seconds). Note that this includes building the native Wine build tools, +# and the 32 and 64 bit test executables. +$ReconfigTimeout = (1 + 2 * 5) * 60; # How much to add to the task timeout to account for file transfers, etc. $TimeoutMargin = 2 * 60; # Maximum amount of traces for a test unit. -- 2.17.1

1 0

[PATCH] testbot: Simplify a loop in PatchUtils::GetPatchImpact().
by Francois Gouget 20 Jun '18

20 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index ec609d987..6eb8e3cd8 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -227,10 +227,8 @@ sub GetPatchImpact($;$$) $Impacts->{ModuleCount} = 0; $Impacts->{UnitCount} = 0; - foreach my $Module (keys %{$Impacts->{Tests}}) + foreach my $TestInfo (values %{$Impacts->{Tests}}) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - # For each module, identify modifications to non-C files and helper dlls my $AllUnits; foreach my $File (keys %{$TestInfo->{Files}}) -- 2.17.1

1 0

K32EnumDeviceDrivers
by Anthony Lauzon 19 Jun '18

19 Jun '18

Hi All, I've been hacking away at K32EnumDeviceDrivers trying to get it to properly handle calls, and have made some decent progress that maybe some of you who are experts can finish. The reason why I am trying to implement K32EnumDeviceDrivers is that Creative's Emulator X3 crashes when trying to call it. I've managed to get the app one step closer to launching with this K32EnumDeviceDrivers implementation, which does in fact enumerate the devices, and am now stuck on a different error. I hope this patch is of some utility to you all. Anthony

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2018