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

[PATCH] inetcomm/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 5, 2018

June 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 4c40c1189f..02b93e9911 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -129,7 +129,7 @@ static WCHAR *a2w(const char *str) static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -1430,7 +1430,7 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) CloseHandle(file); sprintf(urla, test->url, file_name); - MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, sizeof(test_url)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, ARRAY_SIZE(test_url)); hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); ok(hres == S_OK, "Could not create protocol handler: %08x\n", hres); @@ -1514,13 +1514,13 @@ static void test_mhtml_protocol_info(void) &IID_IInternetProtocolInfo, (void**)&protocol_info); ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); - for(i = 0; i < sizeof(combine_tests)/sizeof(*combine_tests); i++) { + for(i = 0; i < ARRAY_SIZE(combine_tests); i++) { base_url = a2w(combine_tests[i].base_url); relative_url = a2w(combine_tests[i].relative_url); combined_len = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, - combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); todo_wine_if(combine_tests[i].todo) ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); if(SUCCEEDED(hres)) { @@ -1541,7 +1541,7 @@ static void test_mhtml_protocol_info(void) } hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, - combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres); IInternetProtocolInfo_Release(protocol_info); @@ -1605,7 +1605,7 @@ static void test_mhtml_protocol(void) if(!broken_mhtml_resolver) test_mhtml_protocol_info(); - for(i = 0; i < sizeof(binding_tests)/sizeof(*binding_tests); i++) + for(i = 0; i < ARRAY_SIZE(binding_tests); i++) test_mhtml_protocol_binding(binding_tests + i); } @@ -1628,7 +1628,7 @@ static void test_MimeOleObjectFromMoniker(void) {"../test.mht", "mhtml:../test.mht"} }; - for(i = 0; i < sizeof(tests)/sizeof(*tests); i++) { + for(i = 0; i < ARRAY_SIZE(tests); i++) { url = a2w(tests[i].url); hres = CreateURLMoniker(NULL, url, &mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); -- 2.14.4

1 0

[PATCH] imagehlp/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 5, 2018

June 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imagehlp/tests/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 65f59700e3..c0a26c39dc 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -225,7 +225,7 @@ static const struct expected_blob b1[] = { {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn), &bin.idata_section.ibn} }; -static const struct expected_update_accum a1 = { sizeof(b1) / sizeof(b1[0]), b1, TRUE }; +static const struct expected_update_accum a1 = { ARRAY_SIZE(b1), b1, TRUE }; static const struct expected_blob b2[] = { {FILE_PE_START, &bin}, @@ -235,7 +235,7 @@ static const struct expected_blob b2[] = { {FILE_IDATA-FILE_TEXT, &bin.text_section}, {FILE_TOTAL-FILE_IDATA, &bin.idata_section} }; -static const struct expected_update_accum a2 = { sizeof(b2) / sizeof(b2[0]), b2, FALSE }; +static const struct expected_update_accum a2 = { ARRAY_SIZE(b2), b2, FALSE }; /* Creates a test file and returns a handle to it. The file's path is returned * in temp_file, which must be at least MAX_PATH characters in length. -- 2.14.4

1 0

[PATCH 2/2 v2] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Piotr Caban June 5, 2018

June 5, 2018

From: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fix whitespace errors - remove todo_wine from tests after skip - fix memory leaks dlls/msvcp120/tests/msvcp120.c | 155 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] msvcp120: Fix _Getcvt tests when zh_CN system locale is used
by Piotr Caban June 5, 2018

June 5, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)

1 0

[PATCH] ole32/tests: Store GUIDs by reference.
by Thomas Faber June 5, 2018

June 5, 2018

Fixes MSVC build. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- This is an alternative to "ole32/tests: Fix MSVC build.", suggested by Dmitry. dlls/ole32/tests/marshal.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 42049032196..39867394fb5 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -560,12 +560,12 @@ static IPSFactoryBuffer PSFactoryBuffer = { &PSFactoryBufferVtbl }; struct host_object_data { IStream *stream; - IID iid; + const IID *iid; IUnknown *object; MSHLFLAGS marshal_flags; IMessageFilter *filter; IUnknown *register_object; - CLSID register_clsid; + const CLSID *register_clsid; HANDLE marshal_event; }; @@ -581,7 +581,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if(data->register_object) { - hr = CoRegisterClassObject(&data->register_clsid, data->register_object, + hr = CoRegisterClassObject(data->register_clsid, data->register_object, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &registration_key); ok(hr == S_OK, "CoRegisterClassObject failed: %08x\n", hr); } @@ -594,7 +594,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) ok_ole_success(hr, CoRegisterMessageFilter); } - hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); + hr = CoMarshalInterface(data->stream, data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); ok_ole_success(hr, CoMarshalInterface); /* force the message queue to be created before signaling parent thread */ @@ -639,7 +639,7 @@ static DWORD start_host_object2(struct host_object_data *object_data, HANDLE *th static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, HANDLE *thread) { - struct host_object_data object_data = { stream, *riid, object, marshal_flags }; + struct host_object_data object_data = { stream, riid, object, marshal_flags }; return start_host_object2(&object_data, thread); } @@ -1254,9 +1254,9 @@ static void test_marshal_channel_buffer(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, + struct host_object_data object_data = { NULL, &IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, - CLSID_WineTestPSFactoryBuffer }; + &CLSID_WineTestPSFactoryBuffer }; cLocks = 0; external_connections = 0; @@ -2321,7 +2321,7 @@ static void test_message_filter(void) IMessageFilter *prev_filter = NULL; HANDLE thread; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; cLocks = 0; @@ -4213,7 +4213,7 @@ static void test_channel_hook(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); -- 2.16.1.windows.2

2 1

[PATCH] ole32/tests: Fix MSVC build.
by Thomas Faber June 5, 2018

June 5, 2018

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/ole32/tests/marshal.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 42049032196..b989c746c16 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -60,6 +60,8 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define GUID_MEMBERS(g) {(g).Data1, (g).Data2, (g).Data3, {(g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]}} + DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); @@ -1254,9 +1256,9 @@ static void test_marshal_channel_buffer(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IOleClientSite), (IUnknown*)&Test_OleClientSite, MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, - CLSID_WineTestPSFactoryBuffer }; + GUID_MEMBERS(CLSID_WineTestPSFactoryBuffer) }; cLocks = 0; external_connections = 0; @@ -2321,7 +2323,7 @@ static void test_message_filter(void) IMessageFilter *prev_filter = NULL; HANDLE thread; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IClassFactory), (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; cLocks = 0; @@ -4213,7 +4215,7 @@ static void test_channel_hook(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IClassFactory), (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); -- 2.16.1.windows.2

2 3

[PATCH 1/5] wined3d: Slightly improve formatting of generated GLSL shader interfaces.
by Matteo Bruni June 5, 2018

June 5, 2018

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3692a276518..d6615d7c605 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2174,9 +2174,9 @@ static const char *shader_glsl_interpolation_qualifiers(enum wined3d_shader_inte switch (mode) { case WINED3DSIM_CONSTANT: - return "flat"; + return "flat "; case WINED3DSIM_LINEAR_NOPERSPECTIVE: - return "noperspective"; + return "noperspective "; default: FIXME("Unhandled interpolation mode %#x.\n", mode); case WINED3DSIM_NONE: @@ -2207,7 +2207,7 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i for (i = 0; i < element_count; ++i) { mode = wined3d_extract_interpolation_mode(interpolation_mode, i); - shader_addline(buffer, "%s vec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); + shader_addline(buffer, " %svec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); } shader_addline(buffer, "} shader_in;\n"); } @@ -2242,7 +2242,7 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_ mode = wined3d_extract_interpolation_mode(interpolation_mode, i); interpolation_qualifiers = shader_glsl_interpolation_qualifiers(mode); } - shader_addline(buffer, "%s vec4 reg%u;\n", interpolation_qualifiers, i); + shader_addline(buffer, " %svec4 reg%u;\n", interpolation_qualifiers, i); } shader_addline(buffer, "} shader_out;\n"); } -- 2.16.1

4 10

[PATCH] testbot: Make Step::FileName and FileType optional.
by Francois Gouget June 5, 2018

June 5, 2018

Some steps don't have an input filename (like the Reconfig tasks) so it makes no sense to force setting FileName or FileType to a dummy value. However enum fields cannot be left undefined so add a 'none' value. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: This requires updating the database schema and then restarting the TestBot Engine and website. testbot/bin/CheckForWinetestUpdate.pl | 3 +-- testbot/ddl/update35.sql | 5 +++++ testbot/ddl/winetestbot.sql | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 11 +++++++++-- testbot/lib/WineTestBot/StepsTasks.pm | 4 +++- testbot/web/JobDetails.pl | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 testbot/ddl/update35.sql diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a79f60c71..f41148f12 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -251,8 +251,7 @@ sub AddReconfigJob() my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); $NewStep->Type("reconfig"); - $NewStep->FileName("-"); - $NewStep->FileType("patchdlls"); + $NewStep->FileType("none"); $NewStep->InStaging(!1); # Add a task for the build VM diff --git a/testbot/ddl/update35.sql b/testbot/ddl/update35.sql new file mode 100644 index 000000000..3ca3023f3 --- /dev/null +++ b/testbot/ddl/update35.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE Steps + MODIFY FileName VARCHAR(100) NULL, + MODIFY FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 9ec428c04..9a28385a9 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -132,8 +132,8 @@ CREATE TABLE Steps PreviousNo INT(2) NULL, Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, - FileName VARCHAR(100) NOT NULL, - FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') 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, diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 977419474..aea1aee04 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -89,6 +89,7 @@ sub InitializeNew($$) $self->Status("queued"); $self->Type("single"); + $self->FileType("none"); $self->InStaging(1); $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); @@ -117,6 +118,10 @@ sub Validate($) { return ("PreviousNo", "The previous step number must be less than this one's."); } + if (defined $self->FileName and $self->FileType eq "none") + { + return ("FileType", "A file has been specified but no FileType"); + } return $self->SUPER::Validate(); } @@ -146,6 +151,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $StepNo) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -256,8 +263,8 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), + 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), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index b9f70d768..84c5a005f 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -44,6 +44,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -189,7 +191,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), + CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 6bf4a12e8..3e638f717 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -486,7 +486,7 @@ sub GenerateDataCell($$$$$) elsif ($PropertyName eq "FileName") { my $FileName = $StepTask->GetFullFileName(); - if (-r $FileName) + if ($FileName and -r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo); -- 2.17.0

1 0

[PATCH] testbot: Log errors that happen when updating a Job's status.
by Francois Gouget June 5, 2018

June 5, 2018

Such errors are important as they can prevent the Jobs from ever being marked as completed. So trace them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This helps diagnose issues where the database schema and the TestBot's ORM database model are out of sync. testbot/lib/WineTestBot/Jobs.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b1ffd3e48..13a389586 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -243,7 +243,12 @@ sub UpdateStatus($) { $self->Ended(time); } - $self->Save(); + my ($ErrProperty, $ErrMessage) = $self->Save(); + if (defined $ErrMessage) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Could not update job status: $ErrMessage\n"); + } last; } } -- 2.17.0

1 0

[PATCH] testbot: Add proper command line options to CheckForWinetestUpdate.pl.
by Francois Gouget June 5, 2018

June 5, 2018

The options make it possible to test a specific job/task creation without having to way for a new WineTest binary download each time. Also it is now possible to specify the exact task type to create and if none is given the script will now handle all of them. This way the crontab commands don't need to be updated when new task types are added. 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> --- Note: This requires updating the crontab entries. Typically they can both be replaced with a single command that will create all the relevant jobs: */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl --log-only testbot/bin/CheckForWinetestUpdate.pl | 273 +++++++++++++++++++------- testbot/doc/INSTALL.txt | 3 +- 2 files changed, 199 insertions(+), 77 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 20eacec63..a79f60c71 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -6,6 +6,7 @@ # runs the full test suite on the standard Windows test VMs. # # Copyright 2009 Ge van Geldorp +# Copyright 2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,8 @@ sub BEGIN unshift @INC, "$::RootDir/lib"; } } +my $Name0 = $0; +$Name0 =~ s+^.*/++; use File::Basename; use File::Compare; @@ -60,11 +63,112 @@ my %WineTestUrls = ( 64 => "http://test.winehq.org/builds/winetest64-latest.exe" ); +my %TaskTypes = (build => 1, base32 => 1, winetest32 => 1, all64 => 1); + + +my $Debug; +sub Debug(@) +{ + print STDERR @_ if ($Debug); +} + +my $LogOnly; +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + +=pod +=over 12 + +=item C<UpdateWineTest()> + +Downloads the latest WineTest executable. + +Returns 1 if the executable was updated, 0 if it was not, and -1 if an +error occurred. + +=back +=cut + +sub UpdateWineTest($$) +{ + my ($OptCreate, $Bits) = @_; + + my $BitsSuffix = ($Bits == 64 ? "64" : ""); + my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; + my $LatestFileName = "$DataDir/latest/$LatestBaseName"; + if ($OptCreate) + { + return (1, $LatestBaseName) if (-r $LatestFileName); + Debug("$LatestBaseName is missing\n"); + } + + # See if the online WineTest executable is newer + my $UA = LWP::UserAgent->new(); + $UA->agent("WineTestBot"); + my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); + if (-r $LatestFileName) + { + my $Since = gmtime((stat $LatestFileName)[9]); + $Request->header("If-Modified-Since" => "$Since GMT"); + } + Debug("Checking $WineTestUrls{$Bits}\n"); + my $Response = $UA->request($Request); + if ($Response->code == RC_NOT_MODIFIED) + { + Debug("$LatestBaseName is already up to date\n"); + return (0, $LatestBaseName); # Already up to date + } + if ($Response->code != RC_OK) + { + Error "Unexpected HTTP response code ", $Response->code, "\n"; + return (-1, undef); + } + + # Download the WineTest executable + Debug("Downloading $LatestBaseName\n"); + umask 002; + mkdir "$DataDir/staging"; + my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); + if (!$fh) + { + Error "Could not create staging file: $!\n"; + return (-1, undef); + } + print $fh $Response->decoded_content(); + close($fh); + + if (-r $LatestFileName and compare($StagingFileName, $LatestFileName) == 0) + { + Debug("$LatestBaseName did not change\n"); + unlink($StagingFileName); + return (0, $LatestBaseName); # No change after all + } + + # Save the WineTest executable to the latest directory for the next round + mkdir "$DataDir/latest"; + if (!move($StagingFileName, $LatestFileName)) + { + Error "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; + unlink($StagingFileName); + return (-1, undef); + } + utime time, $Response->last_modified, $LatestFileName; + + return (1, $LatestBaseName); +} sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $Remarks = ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other"); + $Remarks = "WineTest: $Remarks VMs"; + Debug("Creating the '$Remarks' job\n"); + my $VMs = CreateVMs(); if ($Bits == 64) { @@ -84,6 +188,7 @@ sub AddJob($$$) if ($VMs->GetItemsCount() == 0) { # There is nothing to do + Debug(" Found no VM\n"); return 1; } @@ -97,9 +202,7 @@ sub AddJob($$$) my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); - $NewJob->Remarks("WineTest: " . - ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other") . - " VMs"); + $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; @@ -114,6 +217,7 @@ sub AddJob($$$) my $Tasks = $NewStep->Tasks; foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { + Debug(" $VMKey\n"); my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); @@ -123,7 +227,7 @@ sub AddJob($$$) my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - LogMsg "Failed to save job: $ErrMessage\n"; + Error "Failed to save job: $ErrMessage\n"; unlink($StagingFileName); return 0; } @@ -133,12 +237,15 @@ sub AddJob($$$) sub AddReconfigJob() { + my $Remarks = "Update Wine to latest git"; + Debug("Creating the '$Remarks' job\n"); + # First create a new job my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(3); - $NewJob->Remarks("Update Wine to latest git"); + $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; @@ -153,6 +260,7 @@ sub AddReconfigJob() $VMs->AddFilter("Type", ["build"]); $VMs->AddFilter("Role", ["base"]); my $BuildVM = ${$VMs->GetItems()}[0]; + Debug(" ", $BuildVM->GetKey(), "\n"); my $Task = $NewStep->Tasks->Add(); $Task->VM($BuildVM); $Task->Timeout($ReconfigTimeout); @@ -161,97 +269,112 @@ sub AddReconfigJob() my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - LogMsg "Failed to save reconfig job: $ErrMessage\n"; + Error "Failed to save reconfig job: $ErrMessage\n"; return 0; } } -my $Bits = $ARGV[0]; -if (!$Bits) -{ - die "Usage: CheckForWinetestUpdate.pl <bits>"; -} -if ($Bits =~ m/^(32|64)$/) + +# +# Command line processing +# + +my ($OptCreate, %OptTypes, $Usage); +while (@ARGV) { - $Bits = $1; + my $Arg = shift @ARGV; + if ($Arg eq "--create") + { + $OptCreate = 1; + } + elsif ($TaskTypes{$Arg}) + { + $OptTypes{$Arg} = 1; + } + elsif ($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; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } } -else + +# Check parameters +if (!defined $Usage) { - die "Invalid number of bits $Bits"; + map { $OptTypes{$_} = 1 } keys %TaskTypes if (!%OptTypes); } -my $BitsSuffix = ($Bits == 64 ? "64" : ""); - -# Download the winetest executable if new -my $UA = LWP::UserAgent->new(); -$UA->agent("WineTestBot"); -my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); -my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; -my $LatestFileName = "$DataDir/latest/$LatestBaseName"; -if (-r $LatestFileName) +if (defined $Usage) { - my $Since = gmtime((stat $LatestFileName)[9]); - $Request->header("If-Modified-Since" => "$Since GMT"); + print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [TASKTYPE] ...\n"; + print "\n"; + print "Where TASKTYPE is one of: ", join(" ", sort keys %TaskTypes), "\n"; + exit $Usage; } -my $Response = $UA->request($Request); -if ($Response->code != RC_OK) + + +# +# Create the 32 bit tasks +# + +my $Rc = 0; +if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32}) { - if ($Response->code != RC_NOT_MODIFIED) + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 32); + if ($Create < 0) { - LogMsg "Unexpected HTTP response code ", $Response->code, "\n"; - exit 1; + $Rc = 1; + } + elsif ($Create == 1) + { + # A new executable means there have been commits so update Wine. Create + # this job first purely to make the WineTestBot job queue look nice, and + # arbitrarily do it only for 32-bit executables to avoid redundant updates. + $Rc = 1 if ($OptTypes{build} and !AddReconfigJob()); + $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, 32)); + $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, 32)); } - exit 0; } -# Store the new WineTest executable in the staging directory: -# - So we can compare it to the reference one in the latest directory to -# verify that it truly is new. -# - Because we don't know the relevant Job and Step IDs yet and thus cannot -# put it in the jobs directory tree. -umask 002; -mkdir "$DataDir/staging"; -my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); -if (!$fh) -{ - LogMsg "Could not create staging file: $!\n"; - exit 1; -} -print $fh $Response->decoded_content(); -close($fh); -my $NewFile = 1; -if (-r $LatestFileName) -{ - $NewFile = compare($StagingFileName, $LatestFileName) != 0; -} -if (!$NewFile) -{ - # Nothing to do - unlink($StagingFileName); - exit 0; -} +# +# Create the 64 bit tasks +# -# Save the WineTest executable in the latest directory for the next round -mkdir "$DataDir/latest"; -if (!move($StagingFileName, $LatestFileName)) +if ($OptTypes{all64}) { - LogMsg "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; - unlink($StagingFileName); - exit 1; + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 64); + if ($Create < 0) + { + $Rc = 1; + } + elsif ($Create == 1) + { + $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, 64)); + } } -utime time, $Response->last_modified, $LatestFileName; - -# A new executable means there have been commits so update Wine. Create this -# job first purely to make the WineTestBot job queue look nice, and arbitrarily -# do it only for 32-bit executables to avoid redundant updates. -my $rc = 0; -$rc = 1 if ($Bits == 32 and !AddReconfigJob()); - -$rc = 1 if (!AddJob(1, $LatestBaseName, $Bits)); -$rc = 1 if ($Bits == 32 and !AddJob(!1, $LatestBaseName, $Bits)); RescheduleJobs(); LogMsg "Submitted jobs\n"; -exit $rc; +exit $Rc; diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 8827c227d..cb7c31b97 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -86,8 +86,7 @@ Setup for Wine's patches site: Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 32 - */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 64 + */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl --log-only Setup for wine-devel: - A proper WineTestBot system should integrate with Wine's patches site. -- 2.17.0

1 0