July 2018 - Wine-commits - list.winehq.org

Dmitry Timoshkov : advapi32/tests: Add more tests for performance counters.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 72a7de1a0fb85e436351a1f5cddd6e1035ba18bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a7de1a0fb85e436351a1f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 11 12:15:58 2018 +0800 advapi32/tests: Add more tests for performance counters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 181 ++++++++++++++++++++++++++++++++++++++++- include/winreg.h | 2 + 2 files changed, 179 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72a7de1a0fb85e436351…

1 0

Dmitry Timoshkov : include: Add more definitions for performance counters.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 8de2464cf0d528981d5c6e2bb3dab34b4d873ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de2464cf0d528981d5c6e2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 11 12:16:03 2018 +0800 include: Add more definitions for performance counters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winperf.h | 113 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 97 insertions(+), 16 deletions(-) diff --git a/include/winperf.h b/include/winperf.h index dce1a6d..113bfba 100644 --- a/include/winperf.h +++ b/include/winperf.h @@ -67,25 +67,106 @@ #define PERF_DETAIL_EXPERT 300 #define PERF_DETAIL_WIZARD 400 +#include <pshpack8.h> + /* Performance data structure header * returned in answer to HKEY_PERFORMANCE_DATA request */ -typedef struct _PERF_DATA_BLOCK { - WCHAR Signature[4]; - DWORD LittleEndian; - DWORD Version; - DWORD Revision; - DWORD TotalByteLength; - DWORD HeaderLength; - DWORD NumObjectTypes; - DWORD DefaultObject; - SYSTEMTIME SystemTime; - LARGE_INTEGER PerfTime; - LARGE_INTEGER PerfFreq; - LARGE_INTEGER PerfTime100nSec; - DWORD SystemNameLength; - DWORD SystemNameOffset; -} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK, *LPPERF_DATA_BLOCK; +#define PERF_DATA_VERSION 1 +#define PERF_DATA_REVISION 1 + +typedef struct _PERF_DATA_BLOCK +{ + WCHAR Signature[4]; + DWORD LittleEndian; + DWORD Version; + DWORD Revision; + DWORD TotalByteLength; + DWORD HeaderLength; + DWORD NumObjectTypes; + DWORD DefaultObject; + SYSTEMTIME SystemTime; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; + LARGE_INTEGER PerfTime100nSec; + DWORD SystemNameLength; + DWORD SystemNameOffset; +} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK; + +#define PERF_NO_INSTANCES -1 + +typedef struct _PERF_OBJECT_TYPE +{ + DWORD TotalByteLength; + DWORD DefinitionLength; + DWORD HeaderLength; + DWORD ObjectNameTitleIndex; +#ifdef _WIN64 + DWORD ObjectNameTitle; +#else + LPWSTR ObjectNameTitle; +#endif + DWORD ObjectHelpTitleIndex; +#ifdef _WIN64 + DWORD ObjectHelpTitle; +#else + LPWSTR ObjectHelpTitle; +#endif + DWORD DetailLevel; + DWORD NumCounters; + LONG DefaultCounter; + LONG NumInstances; + DWORD CodePage; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; +} PERF_OBJECT_TYPE, *PPERF_OBJECT_TYPE; + +typedef struct _PERF_COUNTER_DEFINITION +{ + DWORD ByteLength; + DWORD CounterNameTitleIndex; +#ifdef _WIN64 + DWORD CounterNameTitle; +#else + LPWSTR CounterNameTitle; +#endif + DWORD CounterHelpTitleIndex; +#ifdef _WIN64 + DWORD CounterHelpTitle; +#else + LPWSTR CounterHelpTitle; +#endif + LONG DefaultScale; + DWORD DetailLevel; + DWORD CounterType; + DWORD CounterSize; + DWORD CounterOffset; +} PERF_COUNTER_DEFINITION, *PPERF_COUNTER_DEFINITION; + +#define PERF_NO_UNIQUE_ID -1 + +typedef struct _PERF_INSTANCE_DEFINITION +{ + DWORD ByteLength; + DWORD ParentObjectTitleIndex; + DWORD ParentObjectInstance; + LONG UniqueID; + DWORD NameOffset; + DWORD NameLength; +} PERF_INSTANCE_DEFINITION, *PPERF_INSTANCE_DEFINITION; + +typedef struct _PERF_COUNTER_BLOCK +{ + DWORD ByteLength; +} PERF_COUNTER_BLOCK, *PPERF_COUNTER_BLOCK; + + +#include <poppack.h> + +typedef DWORD (APIENTRY PM_OPEN_PROC)(LPWSTR); +typedef DWORD (APIENTRY PM_COLLECT_PROC)(LPWSTR,LPVOID *,LPDWORD,LPDWORD); +typedef DWORD (APIENTRY PM_CLOSE_PROC)(void); +typedef DWORD (APIENTRY PM_QUERY_PROC)(LPDWORD,LPVOID *,LPDWORD,LPDWORD); #endif /* _WINPERF_ */

1 0

Michael Müller : browseui: Implement IProgressDialog: :SetAnimation.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: ff529f46459f375bcb2de545da7348337a1f7159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff529f46459f375bcb2de545… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jul 10 00:52:20 2018 +0000 browseui: Implement IProgressDialog::SetAnimation. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/browseui.rc | 2 +- dlls/browseui/progressdlg.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 833b139..4c612e9 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -32,7 +32,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_C CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, ACS_TRANSPARENT | ACS_AUTOPLAY, 12, 10, 236, 25 LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 09c1996..7cba7d6 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -403,7 +403,16 @@ static HRESULT WINAPI ProgressDialog_SetTitle(IProgressDialog *iface, LPCWSTR pw static HRESULT WINAPI ProgressDialog_SetAnimation(IProgressDialog *iface, HINSTANCE hInstance, UINT uiResourceId) { - FIXME("(%p, %p, %d) - stub\n", iface, hInstance, uiResourceId); + ProgressDialog *This = impl_from_IProgressDialog(iface); + + TRACE("(%p, %p, %u)\n", iface, hInstance, uiResourceId); + + if (IS_INTRESOURCE(uiResourceId)) + { + if (!SendDlgItemMessageW(This->hwnd, IDC_ANIMATION, ACM_OPENW, (WPARAM)hInstance, uiResourceId)) + WARN("Failed to load animation\n"); + } + return S_OK; }

1 0

Piotr Caban : msvcp120: Fix concurrent_vector_int_dtor helper.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: c217dd36cb783fb9debd479c616da7d8280432fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c217dd36cb783fb9debd479c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 11 12:32:25 2018 +0200 msvcp120: Fix concurrent_vector_int_dtor helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 959f7a8..cd8a514 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2576,10 +2576,14 @@ static void concurrent_vector_int_dtor(vector_base_v4 *this) blocks = (size_t)call_func2(p_vector_base_v4__Internal_clear, this, concurrent_vector_int_destroy); - while(this->first_block && blocks >= this->first_block) { + for(blocks--; blocks >= this->first_block; blocks--) { vector_alloc_count--; - free(this->segment[blocks - this->first_block]); - blocks--; + free(this->segment[blocks]); + } + + if(this->first_block) { + vector_alloc_count--; + free(this->segment[0]); } call_func1(p_vector_base_v4_dtor, this);

1 0

Francois Gouget : testbot/web: Hightlight the winediag and X errors.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: tools Branch: master Commit: 16eaec6d1b54bea0b77e521e4dbf225885edb37b URL: https://source.winehq.org/git/tools.git/?a=commit;h=16eaec6d1b54bea0b77e521… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:31:11 2018 +0200 testbot/web: Hightlight the winediag and X errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 8 +++++++- testbot/web/WineTestBot.css | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0ef9609..5e6407b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -431,7 +431,13 @@ sub GetLogLineCategory($) { return "error"; } - if ($Line =~ /^BotError:/) + if ($Line =~ /:winediag:/) + { + return "diag"; + } + if ($Line =~ /^BotError:/ or + $Line =~ /^X Error of failed request: / or + $Line =~ / opcode of failed request: /) { return "boterror"; } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index ae20382..9656254 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -378,6 +378,7 @@ pre .log-todo { color: #d08000; } .log-error { color: red; } .log-boterror { color: #cc0052; } +.log-diag { color: #e56300; } a.title { color:inherit; text-decoration: none; }

1 0

Francois Gouget : testbot/WineSendLog: Print a message for non-mailing list jobs.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: tools Branch: master Commit: 507d75c0536ef921dcd8a38bccfc3c6cbc97d23e URL: https://source.winehq.org/git/tools.git/?a=commit;h=507d75c0536ef921dcd8a38… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:31:19 2018 +0200 testbot/WineSendLog: Print a message for non-mailing list jobs. WineSendLog exits early for these. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 29da4a0..f095bce 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -426,7 +426,11 @@ EOF close(SENDMAIL); # This is all for jobs submitted from the website - return if (!defined $Job->Patch); + if (!defined $Job->Patch) + { + Debug("Not a mailing list patch -> all done.\n"); + return; + } # # Build a job summary with only the new errors

1 0

Francois Gouget : testbot: Remove the Step::InStaging field.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: tools Branch: master Commit: bd9e99f5c6e62746aaff7b28a217b2ae03ba727e URL: https://source.winehq.org/git/tools.git/?a=commit;h=bd9e99f5c6e62746aaff7b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:34:51 2018 +0200 testbot: Remove the Step::InStaging field. It has been replaced by the new Job-based staging mechanism and is not needed anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 3 --- testbot/ddl/update38.sql | 4 ++++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 23 ----------------------- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 -- testbot/lib/WineTestBot/Patches.pm | 3 --- testbot/lib/WineTestBot/Steps.pm | 29 ----------------------------- testbot/lib/WineTestBot/StepsTasks.pm | 17 +---------------- testbot/web/Submit.pl | 3 --- 9 files changed, 5 insertions(+), 80 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a570a1b..df5a326 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -207,7 +207,6 @@ sub AddJob($$$) $NewStep->Type("suite"); $NewStep->FileName($LatestBaseName); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); - $NewStep->InStaging(!1); # Add a task for each VM my $Tasks = $NewStep->Tasks; @@ -276,7 +275,6 @@ sub AddReconfigJob($) my $BuildStep = $Steps->Add(); $BuildStep->Type("reconfig"); $BuildStep->FileType("none"); - $BuildStep->InStaging(!1); # And a task for each VM my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); @@ -309,7 +307,6 @@ sub AddReconfigJob($) $NewStep->PreviousNo($BuildStep->No); $NewStep->Type("suite"); $NewStep->FileType("none"); - $NewStep->InStaging(!1); foreach my $VMKey (@$SortedKeys) { diff --git a/testbot/ddl/update38.sql b/testbot/ddl/update38.sql new file mode 100644 index 0000000..56f7d11 --- /dev/null +++ b/testbot/ddl/update38.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Steps + DROP InStaging; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 12b5dea..a6adea8 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -134,7 +134,6 @@ CREATE TABLE Steps Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, FileName VARCHAR(100) NULL, FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, - InStaging ENUM('Y', 'N') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, PRIMARY KEY (JobId, No), diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 0dbc7f9..d3efcb8 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1877,29 +1877,6 @@ </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> - <dia:string>#InStaging#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#BOOL#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> <dia:string>#DebugLevel#</dia:string> </dia:attribute> <dia:attribute name="type"> diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 3ed86e2..4d944c9 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -572,8 +572,6 @@ sub _ScheduleTasks($) my $Previous = ""; # Avoid undefined values for hash indices if (!$Step->PreviousNo) { - # The first step may need to get files from the staging area - $Step->HandleStaging() if ($Step->Status eq "queued"); $StepRank = 0; $StepVMs{$Step} = []; } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index cafd54d..2d553fe 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -182,7 +182,6 @@ sub Submit($$$) my $BuildStep = $NewJob->Steps->Add(); $BuildStep->FileName("patch.diff"); $BuildStep->FileType("patchdlls"); - $BuildStep->InStaging(!1); $BuildStep->Type("build"); $BuildStep->DebugLevel(0); @@ -220,7 +219,6 @@ sub Submit($$$) $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); $NewStep->FileType("exe$Bits"); - $NewStep->InStaging(!1); # And a task for each VM my $Tasks = $NewStep->Tasks; @@ -248,7 +246,6 @@ sub Submit($$$) my $NewStep = $NewJob->Steps->Add(); $NewStep->FileName("patch.diff"); $NewStep->FileType("patchdlls"); - $NewStep->InStaging(!1); $NewStep->DebugLevel(0); # And a task for each VM diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 71e0447..9a4ada9 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -90,7 +90,6 @@ sub InitializeNew($$) $self->Status("queued"); $self->Type("single"); $self->FileType("none"); - $self->InStaging(1); $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); @@ -164,33 +163,6 @@ sub GetFullFileName($) return $Path . $self->FileName; } -sub HandleStaging($$) -{ - my ($self) = @_; - - # Always at least create the step's directory - my $StepDir = $self->CreateDir(); - return undef if (! $self->InStaging); - - my $FileName = $self->FileName; - if ($FileName !~ m/^[0-9a-z-]+_(.*)$/) - { - return "Can't split staging filename"; - } - my $BaseName = $1; - $self->FileName($BaseName); - my $StagingFileName = "$DataDir/staging/$FileName"; - if (!move($StagingFileName, $self->GetFullFileName())) - { - return "Could not move the staging file: $!"; - } - - $self->InStaging(!1); - my ($ErrProperty, $ErrMessage) = $self->Save(); - - return $ErrMessage; -} - sub UpdateStatus($$) { my ($self, $Skip) = @_; @@ -266,7 +238,6 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patchdlls', 'patchprograms']), - CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 05854bc..e10cd8c 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -145,22 +145,7 @@ sub _initialize($$) $StepTask->Status($Task->Status); $StepTask->VM($Task->VM); $StepTask->Timeout($Task->Timeout); - if ($Step->InStaging) - { - my $FileName = $Step->FileName; - if ($FileName =~ m/^[\da-fA-F]+ (.*)$/) - { - $StepTask->FileName("$1"); - } - else - { - $StepTask->FileName("unknown"); - } - } - else - { - $StepTask->FileName($Step->FileName); - } + $StepTask->FileName($Step->FileName); $StepTask->FileType($Step->FileType); $StepTask->CmdLineArg($Task->CmdLineArg); $StepTask->Started($Task->Started); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index cb6a124..e207d78 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -801,7 +801,6 @@ sub OnSubmit($) $BuildStep = $Steps->Add(); $BuildStep->FileName($BaseName); $BuildStep->FileType($FileType); - $BuildStep->InStaging(!1); $BuildStep->Type("build"); $BuildStep->DebugLevel(0); @@ -836,7 +835,6 @@ sub OnSubmit($) { $TestStep->FileName($BaseName); } - $TestStep->InStaging(!1); $TestStep->FileType("exe$Bits"); $TestStep->Type("single"); $TestStep->DebugLevel($self->GetParam("DebugLevel")); @@ -874,7 +872,6 @@ sub OnSubmit($) my $WineStep = $Steps->Add(); $WineStep->FileName($BaseName); $WineStep->FileType($FileType); - $WineStep->InStaging(!1); $WineStep->Type("build"); $WineStep->DebugLevel($self->GetParam("DebugLevel")); $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests")));

1 0

Francois Gouget : testbot: Remove support for the old Step files locations.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: tools Branch: master Commit: 09b3464029ecccf474171e4f6bb884723dd64597 URL: https://source.winehq.org/git/tools.git/?a=commit;h=09b3464029ecccf474171e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:35:02 2018 +0200 testbot: Remove support for the old Step files locations. It is no longer needed now that all the existing Jobs follow the new conventions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Steps.pm | 5 ----- testbot/lib/WineTestBot/StepsTasks.pm | 5 ----- 2 files changed, 10 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 9a4ada9..cb2c6ee 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -153,11 +153,6 @@ sub GetFullFileName($) return undef if (!defined $self->FileName); my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - # FIXME: Remove legacy support once no such job remains (so after - # $JobPurgeDays). - my $LegacyPath = "$DataDir/jobs/$JobId/$StepNo/" . $self->FileName; - return $LegacyPath if (-f $LegacyPath); - my $Path = "$DataDir/jobs/$JobId/"; $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); return $Path . $self->FileName; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index e10cd8c..4675194 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -47,11 +47,6 @@ sub GetFullFileName($) return undef if (!defined $self->FileName); my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - # FIXME: Remove legacy support once no such job remains (so after - # $JobPurgeDays). - my $LegacyPath = "$DataDir/jobs/$JobId/". $self->StepNo ."/". $self->FileName; - return $LegacyPath if (-f $LegacyPath); - my $Path = "$DataDir/jobs/$JobId/"; $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); return $Path . $self->FileName;

1 0

Francois Gouget : testbot/LibvirtTool: Only power off the VM if needed for the revert.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: tools Branch: master Commit: 44456b4f96bc602827244416afe2dbbbb7600d10 URL: https://source.winehq.org/git/tools.git/?a=commit;h=44456b4f96bc60282724441… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:35:42 2018 +0200 testbot/LibvirtTool: Only power off the VM if needed for the revert. Reverting from a powered off state is sometimes ten times longer than reverting from the current state. But Libvirt/QEmu is buggy and fails to revert if the VM configuration changes. So try the revert first and, if it fails (which is fast), power off + re-revert the VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 39e8c55..e6742f4 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -411,19 +411,25 @@ sub Revert() } $CurrentStatus = "reverting"; - # Some QEmu/KVM versions are buggy and cannot revert a running VM - Debug(Elapsed($Start), " Powering off the VM\n"); + # Revert the VM (and power it on if necessary) my $Domain = $VM->GetDomain(); - my $ErrMessage = $Domain->PowerOff(); + Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); + my $ErrMessage = $Domain->RevertToSnapshot(); if (defined $ErrMessage) { - LogMsg "Could not power off $VMKey: $ErrMessage\n"; - LogMsg "Trying the revert anyway...\n"; - } + # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware + # configuration to another. So try again after powering off the VM, though + # this can be much slower. + Debug(Elapsed($Start), " Powering off the VM\n"); + $ErrMessage = $Domain->PowerOff(); + if (defined $ErrMessage) + { + FatalError("Could not power off $VMKey: $ErrMessage\n"); + } - # Revert the VM (and power it on if necessary) - Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); - $ErrMessage = $Domain->RevertToSnapshot(); + Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "... again\n"); + $ErrMessage = $Domain->RevertToSnapshot(); + } if (defined $ErrMessage) { FatalError("Could not revert $VMKey to ". $VM->IdleSnapshot .": $ErrMessage\n");

1 0

Francois Gouget : testbot/LibvirtTool: Remove the duplicate units after the elapsed time.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: tools Branch: master Commit: 8b70c57a3b157a4f3e47e48573781f36303dd745 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8b70c57a3b157a4f3e47e48… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:30:52 2018 +0200 testbot/LibvirtTool: Remove the duplicate units after the elapsed time. The string returned by PrettyElapsed() already includes the time unit since it's needed for durations over 1 minute to be readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 91fe053..39e8c55 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -344,7 +344,7 @@ sub Monitor() return 1 if (ChangeStatus("offline", "off", "done")); NotifyAdministrator("The $VMKey VM is working again", "The $VMKey VM started working again after ". - PrettyElapsed($Start) ." seconds."); + PrettyElapsed($Start) ."."); return 0; } } @@ -483,6 +483,6 @@ else Error("Unsupported action $Action!\n"); $Rc = 1; } -LogMsg "$Action on $VMKey completed in ", PrettyElapsed($Start), " s\n"; +LogMsg "$Action on $VMKey completed in ", PrettyElapsed($Start), "\n"; exit $Rc;

1 0