wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

Nikolay Sivov : shell32: Fix SHGetFolderPathAndSubDir() trace message.
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: f75d5625966933562b974540a3f29dfcd720ad50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f75d5625966933562b974540… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 24 00:58:06 2017 +0300 shell32: Fix SHGetFolderPathAndSubDir() trace message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 4f1cdc0..551fec7 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3935,7 +3935,8 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( HRESULT hr = S_OK; LPWSTR pszSubPathW = NULL; LPWSTR pszPathW = NULL; - TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_a(pszSubPath), pszPath); if(pszPath) { pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); @@ -3988,7 +3989,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( CSIDL_Type type; int ret; - TRACE("%p,%p,nFolder=0x%04x,%s\n", hwndOwner,pszPath,nFolder,debugstr_w(pszSubPath)); + TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_w(pszSubPath), pszPath); /* Windows always NULL-terminates the resulting path regardless of success * or failure, so do so first

1 0

Nikolay Sivov : msxml3/tests: Add missing return value test (Coverity).
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: f3693d2b463fbbb41b24f3d109304519ed44f9c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3693d2b463fbbb41b24f3d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 23 13:16:27 2017 +0300 msxml3/tests: Add missing return value test (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9a607e3..87a885d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7467,6 +7467,7 @@ static void test_XSLPattern(void) ok(hr == S_OK, "query=%s, failed with 0x%08x\n", ptr->query, hr); len = 0; hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "Failed to get list length, hr %#x.\n", hr); if (*ptr->list) { ok(len != 0, "query=%s, empty list\n", ptr->query);

1 0

Nikolay Sivov : taskschd: Fix a leak on error path (Coverity).
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: fb4ab15a4e14cec89279fbc7ab2ea12ec1acad89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb4ab15a4e14cec89279fbc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 23 10:51:17 2017 +0300 taskschd: Fix a leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/folder_collection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 969baec..0b2b513 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -239,6 +239,7 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o if (!(folders->path = heap_strdupW(path))) { heap_free(folders); + free_list(list, count); return E_OUTOFMEMORY; } folders->count = count;

1 0

Nikolay Sivov : mlang/tests: Add some return value checks (Coverity).
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: 523e07da5c9ec9bb224d66853a614d39fe6278ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=523e07da5c9ec9bb224d6685… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 23 10:50:57 2017 +0300 mlang/tests: Add some return value checks (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 2e3b36b..9727b4f 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2679,8 +2679,10 @@ static void test_MapFont(IMLangFontLink *font_link, IMLangFontLink2 *font_link2) ok(ret == S_OK, "IMLangFontLink2_ResetFontMapping: expected S_OK, got %08x\n", ret); /* Show that the font cache is global */ - IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &font1); - IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); + ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &font1); + ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); + ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); + ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); ok(font1 != NULL && font2 != NULL, "expected !NULL/!NULL, got %p/%p", font1, font2); ok(font1 == font2, "expected equal, got not equal");

1 0

Nikolay Sivov : hlink/tests: Check return value (Coverity).
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: 2bde3e203b8852ea4fccdd54ffd41fbb74c77970 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bde3e203b8852ea4fccdd54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 23 10:49:48 2017 +0300 hlink/tests: Check return value (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 8350624..e40807c 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -877,11 +877,13 @@ static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, { IBindCtx *bctx; WCHAR *name; + HRESULT hr; CHECK_EXPECT(HBC_GetObject); CreateBindCtx(0, &bctx); - IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + hr = IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); ok(!lstrcmpW(winehq_urlW, name) || !lstrcmpW(winehq_404W, name), "got unexpected url\n"); CoTaskMemFree(name); IBindCtx_Release(bctx);

1 0

Francois Gouget : testbot/web: Show failed Tasks on the Activity page.
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: tools Branch: master Commit: 691925f164e837b968cd4426c5c92e8bd7805ac8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=691925f164e837b968cd442… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 26 01:48:26 2017 +0100 testbot/web: Show failed Tasks on the Activity page. This helps identify transient errors, TestBot errors, or why a task is being re-run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 57 ++++++++++++++++++++++++++++++++++++- testbot/web/Activity.pl | 41 ++++++++++++++++++++++---- testbot/web/WineTestBot.css | 4 +++ 3 files changed, 95 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 31930ed..d66109c 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -66,6 +66,18 @@ describing the TestBot activity. The structure is as follows: ... }, }, + resultvms => { + <VMName1> => { + vm => <VMObject>, + result => <VMResult>, + tries => <Tries>, + maxtries => <MaxTries>, + details => <ResultDetails>, + }, + <VMName2> => { + ... + }, + }, }, <GroupNo2> => { ... @@ -134,11 +146,24 @@ sub GetActivity($) $VMStatus->{status} = $Status; $VMStatus->{rows} = 1; + $VMStatus->{result} = ""; if ($Status eq "running") { $VMStatus->{job} = $Jobs->GetItem($Extra[0]); $VMStatus->{step} = $VMStatus->{job}->Steps->GetItem($Extra[1]) if ($VMStatus->{job}); $VMStatus->{task} = $VMStatus->{step}->Tasks->GetItem($Extra[2]) if ($VMStatus->{step}); + if ($VMStatus->{task}) + { + if ($VMStatus->{task}->Status =~ /^(?:badpatch|badbuild|boterror)$/) + { + $VMStatus->{result} = $VMStatus->{task}->Status; + } + elsif ($VMStatus->{task}->Status eq "completed" and + $VMStatus->{task}->TestFailures) + { + $VMStatus->{result} = "failed"; + } + } } elsif (@Extra) { @@ -148,6 +173,24 @@ sub GetActivity($) $VMStatus->{details} = join(" ", @Extra); } } + elsif ($Record->Type eq "vmresult") + { + my ($RecordName, $RecordHost) = split / /, $Record->Name; + next if (!$VMs->ItemExists($RecordName)); + + my $ResultVMs = ( $Group->{resultvms} ||= {} ); + my $VMResult = ( $ResultVMs->{$RecordName} ||= {} ); + + $VMResult->{host} = $RecordHost; + my ($Result, @Extras) = split / /, $Record->Value; + $VMResult->{result} = $Result; + if (@Extras >= 2 and $Extras[0] =~ /^\d+$/ and $Extras[1] =~ /^\d+$/) + { + $VMResult->{tries} = shift @Extras; + $VMResult->{maxtries} = shift @Extras; + } + $VMResult->{details} = join(" ", @Extras); + } } ### Fill the holes in the table, compute end times, etc. @@ -157,7 +200,8 @@ sub GetActivity($) { my $Group = $Activity->{$RecordGroup->Id}; my $StatusVMs = $Group->{statusvms}; - next if (!$StatusVMs); + my $ResultVMs = $Group->{resultvms}; + next if (!$StatusVMs and !$ResultVMs); if ($LastGroup) { $LastGroup->{end} = $Group->{start}; @@ -175,6 +219,17 @@ sub GetActivity($) { my $LastVMStatus = $LastStatusVMs{$VM->Name} ? $LastStatusVMs{$VM->Name}->{$VM->Name} : undef; + my $VMResult = $ResultVMs->{$VM->Name}; + if ($VMResult and $LastVMStatus and $LastVMStatus->{status} ne "engine") + { + # Transfer the result to the relevant status object + $LastVMStatus->{result} = $VMResult->{result}; + $LastVMStatus->{details} = $VMResult->{details}; + $LastVMStatus->{tries} = $VMResult->{tries}; + $LastVMStatus->{maxtries} = $VMResult->{maxtries}; + } + next if (!$StatusVMs); + my $VMStatus = $StatusVMs->{$VM->Name}; if ($VMStatus) { diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 64a752b..5a730df 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -160,11 +160,26 @@ EOF my $VMStatus = $Group->{statusvms}->{$VM->Name}; next if ($VMStatus->{merged}); - # Add borders to separate VM hosts and indicate anomalies. + # Add borders to separate VM hosts and indicate various anomalies. print "<td class='Record Record-$VMStatus->{status}"; - my $Host = $VM->GetHost(); - print " Record-left" if ($Col > 0 and $SortedVMs[$Col-1]->GetHost() ne $Host); - print " Record-right" if ($Col+1 < @SortedVMs and $SortedVMs[$Col+1]->GetHost() ne $Host); + if ($VMStatus->{result} eq "timeout") + { + print " Record-timeout"; + } + elsif ($VMStatus->{result} eq "boterror") + { + print " Record-boterror"; + } + elsif ($VMStatus->{result} eq "error") + { + print " Record-error"; + } + else + { + my $Host = $VM->GetHost(); + print " Record-left" if ($Col > 0 and $SortedVMs[$Col-1]->GetHost() ne $Host); + print " Record-right" if ($Col+1 < @SortedVMs and $SortedVMs[$Col+1]->GetHost() ne $Host); + } print " Record-miss" if ($VMStatus->{mispredict}); print "'"; print " rowspan='$VMStatus->{rows}'" if ($VMStatus->{rows} > 1); @@ -215,6 +230,17 @@ EOF $Label = "(on $Host) $Label"; } print "$Label ", _GetHtmlDuration($VMStatus->{end} - $VMStatus->{start}); + + my $Result = ""; + if ($VMStatus->{status} ne "dirty") + { + $Result = $VMStatus->{result} if ($VMStatus->{result}); + $Result .= " $VMStatus->{tries}/$VMStatus->{maxtries}" if ($VMStatus->{tries}); + $Result .= ": $VMStatus->{details}" if ($VMStatus->{details}); + $Result =~ s/^: //; + } + print " $Result" if ($Result); + print "</td>\n"; } print "</tr>\n"; @@ -238,8 +264,11 @@ sub GenerateFooter($) print "running a task (in which case it links to it), \n"; print "dirty while the server is powering off the VM after a task or while it assesses its state on startup.\n"; - print "If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. A long horizontal bar indicates the TestBot server was restarted.\n"; - print "This border indicates that the server threw away the VM's current state without using it.\n"; + print "If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. A long horizontal bar indicates the TestBot server was restarted. \n"; + print "This border indicates that the task timed out, \n"; + print "this border denotes a transient (network?) error so the task will be re-run, \n"; + print "and this border indicates a TestBot error. \n"; + print "Finally this border indicates that the server threw away the VM's current state without using it.\n"; print "The VM could also be offline due to a temporary issue, \n"; print "or until the administrator can look at it for maintenance, \n"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 55de9a3..4afbe31 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -348,6 +348,7 @@ td.Record { text-align: center; } .RecordHost { font-size: smaller; } .RecordJob { font-size: smaller; } .RecordDuration { } +.RecordResult { font-size: smaller; font-style: italic; } .Record-start { } .Record-off { color: #c0c0c0; } @@ -371,4 +372,7 @@ td.Record { text-align: center; } /* Special borders */ .Record.Record-left { border-left: thin solid #601919; } .Record.Record-right { border-right: thin solid #601919; } +.Record.Record-boterror { border-left: thick solid red; border-right: thick solid red; } +.Record.Record-error { border-left: thick solid #990000; border-right: thick solid #990000; } +.Record.Record-timeout { border-left: thick solid blue; border-right: thick solid blue; } .Record.Record-miss { border-top: thick dashed #ff6600; }

1 0

Francois Gouget : testbot: Add history records for mutable task results.
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: tools Branch: master Commit: 7bde1f1f231e5e7d6ada0d38ea7344a54a5428cb URL: https://source.winehq.org/git/tools.git/?a=commit;h=7bde1f1f231e5e7d6ada0d3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 26 01:48:06 2017 +0100 testbot: Add history records for mutable task results. When a task fails due to a transient error it is re-run and the fact that a transient error happened cannot be recovered from the final Task object. Similarly the final Task object does not clearly identify timeouts. Furthermore all one can recover from the VM status history is that a Task was run more than once but not the reason why. So save abnormal task termination information in the history record. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 20 ++++++++++++++++---- testbot/bin/WineRunReconfig.pl | 20 ++++++++++++++++---- testbot/bin/WineRunTask.pl | 19 ++++++++++++++++--- testbot/lib/WineTestBot/VMs.pm | 29 +++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 11 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index b91d594..e4295c8 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -45,6 +45,7 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; +use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; @@ -192,10 +193,13 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$) +sub WrapUpAndExit($;$$) { - my ($Status, $Retry) = @_; + my ($Status, $Retry, $Timeout) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; + my $VMResult = $Status eq "boterror" ? "boterror" : + $Status eq "queued" ? "error" : + $Timeout ? "timeout" : ""; my $TestFailures; my $Tries = $Task->TestFailures || 0; @@ -219,6 +223,13 @@ sub WrapUpAndExit($;$) LogTaskError("The previous $Tries run(s) terminated abnormally\n"); } + # Record result details that may be lost or overwritten by a later run + if ($VMResult) + { + $VMResult .= " $Tries $MaxTaskTries" if ($Retry); + $VM->RecordResult(undef, $VMResult); + } + # Update the Task and Job $Task->Status($Status); $Task->TestFailures($TestFailures); @@ -373,7 +384,7 @@ if (!$Pid) # log before giving up # -my ($NewStatus, $ErrMessage, $TAError); +my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -382,6 +393,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { $ErrMessage = "The build timed out\n"; $NewStatus = "badbuild"; + $TaskTimedOut = 1; } else { @@ -480,4 +492,4 @@ $TA->Disconnect(); # Wrap up # -WrapUpAndExit($NewStatus); +WrapUpAndExit($NewStatus, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index ff99fb7..4eefa17 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -45,6 +45,7 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; +use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; @@ -192,11 +193,14 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$) +sub WrapUpAndExit($;$$) { - my ($Status, $Retry) = @_; + my ($Status, $Retry, $Timeout) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : $Status eq 'completed' ? 'idle' : 'dirty'; + my $VMResult = $Status eq "boterror" ? "boterror" : + $Status eq "queued" ? "error" : + $Timeout ? "timeout" : ""; my $TestFailures; my $Tries = $Task->TestFailures || 0; @@ -220,6 +224,13 @@ sub WrapUpAndExit($;$) LogTaskError("The previous $Tries run(s) terminated abnormally\n"); } + # Record result details that may be lost or overwritten by a later run + if ($VMResult) + { + $VMResult .= " $Tries $MaxTaskTries" if ($Retry); + $VM->RecordResult(undef, $VMResult); + } + # Update the Task and Job $Task->Status($Status); $Task->TestFailures($TestFailures); @@ -338,7 +349,7 @@ if (!$Pid) # log before giving up # -my ($NewStatus, $ErrMessage, $TAError); +my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -347,6 +358,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { $ErrMessage = "The build timed out\n"; $NewStatus = "badbuild"; + $TaskTimedOut = 1; } else { @@ -470,4 +482,4 @@ if ($NewStatus eq 'completed') # Wrap up # -WrapUpAndExit($NewStatus); +WrapUpAndExit($NewStatus, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3807a18..65faf72 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -44,6 +44,7 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; +use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; @@ -219,10 +220,13 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$$) +sub WrapUpAndExit($;$$$) { - my ($Status, $TestFailures, $Retry) = @_; + my ($Status, $TestFailures, $Retry, $Timeout) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; + my $VMResult = $Status eq "boterror" ? "boterror" : + $Status eq "queued" ? "error" : + $Timeout ? "timeout" : ""; Debug(Elapsed($Start), " Taking a screenshot\n"); TakeScreenshot($VM, $FullScreenshotFileName); @@ -248,6 +252,13 @@ sub WrapUpAndExit($;$$) LogTaskError("The previous $Tries run(s) terminated abnormally\n"); } + # Record result details that may be lost or overwritten by a later run + if ($VMResult) + { + $VMResult .= " $Tries $MaxTaskTries" if ($Retry); + $VM->RecordResult(undef, $VMResult); + } + # Update the Task and Job $Task->Status($Status); $Task->TestFailures($TestFailures); @@ -489,6 +500,7 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } } +my $TimedOut; Debug(Elapsed($Start), " Retrieving the report file to '$FullLogFileName'\n"); if ($TA->GetFile($RptFileName, $FullLogFileName)) { @@ -712,6 +724,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # so record the failure but don't add an error message. $LogFailures++; $CurrentIsBroken = 1; + $TimedOut = ($Step->Type ne "suite"); } elsif ((!$Pid and !%CurrentPids) or ($Pid and !$CurrentPids{$Pid} and !$CurrentPids{0})) @@ -767,4 +780,4 @@ FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); # Wrap up # -WrapUpAndExit($NewStatus, $TaskFailures); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut || $TimedOut); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 961be52..2ba6b4b 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -566,6 +566,35 @@ sub RecordStatus($$;$) } } +=pod +=over 12 + +=item C<RecordStatus()> + +Adds a Record of the specified VM process result. + +Also resets the last known VM status so a new one will be recorded even if +it matches the current one, for instance if a new revert is started after the +first one failed. + +=back +=cut + +sub RecordResult($$$) +{ + my ($self, $Records, $Result) = @_; + + if ($Records) + { + $Records->AddRecord("vmresult", $self->GetRecordName(), $Result); + } + else + { + SaveRecord("vmresult", $self->GetRecordName(), $Result); + } + delete $_VMStatuses{$self->Name}; +} + package WineTestBot::VMs;

1 0

Alexandre Julliard : Wine release 3.0-rc3
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: website Branch: master Commit: 671b354b78aebf53caf694c9c8f298da14a5b29a URL: https://source.winehq.org/git/website.git/?a=commit;h=671b354b78aebf53caf69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 18:15:21 2017 +0100 Wine release 3.0-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017122201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2017122201.xml b/news/en/2017122201.xml new file mode 100644 index 0000000..bf3889d --- /dev/null +++ b/news/en/2017122201.xml @@ -0,0 +1,12 @@ +<news> +<date>December 22, 2017</date> +<title>Wine 3.0-rc3 Released</title> +<body> + The Wine development release 3.0-rc3 is now available. + <a href="{$root}/announce/3.0-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc3.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

Tag wine-3.0-rc3 : Alexandre Julliard : Release 3.0-rc3
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: refs/tags/wine-3.0-rc3 Tag: f9aeb5322250f2912ed1ad693ca8450d18043cd9 URL: https://source.winehq.org/git/wine.git/?a=tag;h=f9aeb5322250f2912ed1ad693ca… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 18:12:27 2017 +0100 Release 3.0-rc3

1 0

Alexandre Julliard : Release 3.0-rc3.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: c0d8de63a9628aa304dc00edbb725b5abe615b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0d8de63a9628aa304dc00ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 18:12:27 2017 +0100 Release 3.0-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 246 ++++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 ++--- 3 files changed, 130 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0d8de63a9628aa304dc…

1 0

← Newer
1
2
3
4
5
6
7
...
45
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-commits December 2017