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

[PATCH] testbot/web: Move some Submit.pl variables closer to the usage.
by Francois Gouget May 31, 2018

May 31, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 6451745a9..2b4e5ec14 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -509,15 +509,12 @@ sub DetermineFileType($$) { my ($self, $FileName) = @_; - my $ErrMessage = undef; - my $FileType = "unknown"; - my $DllBaseName = undef; - my $TestUnit = undef; if (! sysopen(FH, $FileName, O_RDONLY)) { return ("Unable to open $FileName", "unknown", undef, undef); } + my $FileType = "unknown"; my $Buffer; if (sysread(FH, $Buffer, 0x40)) { @@ -563,6 +560,7 @@ sub DetermineFileType($$) close FH; + my ($ErrMessage, $DllBaseName, $TestUnit); if ($FileType eq "unknown") { my $Impacts = GetPatchImpact($FileName); -- 2.17.0

1 0

[PATCH] testbot: Update the Job, Step and Task documentation.
by Francois Gouget May 31, 2018

May 31, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 24 ++++++++++++++++++++--- testbot/lib/WineTestBot/Steps.pm | 33 +++++++++++++++++++++++++++++--- testbot/lib/WineTestBot/Tasks.pm | 31 ++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ef0d98e24..b1ffd3e48 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -28,13 +28,14 @@ WineTestBot::Job - A job submitted by a user =head1 DESCRIPTION A Job is created when a WineTestBot::User asks for something to be tested -(for automatically generated Jobs this would be the batch user). There are many +(for automatically generated Jobs this would be the batch user). A Job is +composed of one or more WineTestBot::Step objects. There are many paths that can result in the creation of a job: =over =item * -A use submits a patch or binary to test. +A user submits a patch or binary to test. =item * WineTestBot finds a patch to test on the mailing list (and has all the pieces @@ -47,7 +48,24 @@ Job. =back -A Job is composed of multiple WineTestBot::Step objects. +A Job's lifecycle is as follows: +=over + +=item * +A Job is created with Status set to queued which means it is ready to run. + +=item * +As soon as one of the Step starts running, the Job's Status field is set to +running. + +=item * +Once all the Steps have completed the Job's Status is updated to reflect the +overall result: completed, badpatch, etc. + +=item * +If the Job is canceled by the user, then the Status field is set to canceled. + +=back =cut diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 635092d1a..4dc45690e 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -26,9 +26,36 @@ WineTestBot::Step - A Job's Step =head1 DESCRIPTION -A Job is composed of multiple Steps that each do a specific operation: build -the test executable, or run a given test, etc. A Step is in turn composed of -a WineTestBot::Task object for each VM it should be run on. +A Job is composed of one or more Steps that each perform one operation. A +Step is in turn composed of one WineTestBot::Task object for each VM that the +Step should be run on. + +A Step's lifecyle is as follows: +=over + +=item * +A Step is created with Status set to queued which means it is ready to be run +as soon as the PreviousNo Step has completed, or immediately if PreviousNo is +not set. + +=item * +Once one of the Step's Task is running the Step's Status is changed to +running. + +=item * +Once all the Tasks in the Step have completed, the Step's Status is set to one +of the "completion" Status values according to the overall success of its +Tasks: completed, badpatch, etc. + +=item * +If the PreviousNo Step failed then the Status field and that of all its Tasks +is set to skip; and the Step will not be run. + +=item * +If a Step is canceled by the user, then the Status field is set to canceled if +the Step was running, and to skipped if it was queued. + +=back Note that the PreviousNo relation will prevent the deletion of the target Step. It is the responsibility of the caller to delete the Steps in a suitable order, diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 69d551b84..afd4fb4d3 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -31,6 +31,37 @@ performing that Step in a WineTestBot::VM virtual machine. For instance a Step responsible for running a given test would have one Task object for each virtual machine that the test must be performed in. +A Task's lifecyle is as follows: +=over + +=item * +A Task is created with Status set to queued which means it is ready to be run +as soon as long as the Step itself is runnable (see the WineTestBot::Step +documentation). + +=item * +Once the Task is running on the corresponding VM the Status field is set to +running. + +=item * +If running the Task fails due to a transient error the TestFailure field +is checked. If it is lower than a configurable threshold the Status is +reset to queued and the TestFailure field is incremented. Otherwise the +Status is set to boterror and the Task is considered to have completed. + +=item * +If the Task completes normally the Status field is set to the appropriate +value based on the result: completed, badpatch, etc. + +=item * +If the Task is canceled by the user its Status is set to canceled. + +=item * +If the Task's Step cannot be run because the Step it depends on failed, then +Status is set to skipped. + +=back + =cut use WineTestBot::WineTestBotObjects; -- 2.17.0

1 0

[PATCH] testbot/web: Remove pointless 'cleanup' Submit.pl code.
by Francois Gouget May 31, 2018

May 31, 2018

Objects are freed when they get out of scope. So there is no point setting $Jobs to undef. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 2b4e5ec14..2a4521edc 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -871,21 +871,17 @@ sub OnSubmit($) return !1; } - # Clean up, but save the key of the new job - my $JobKey = $NewJob->GetKey(); - $Jobs = undef; - # Notify engine my $ErrMessage = RescheduleJobs(); if (defined $ErrMessage) { $self->{ErrMessage} = $ErrMessage; $self->{Page} = 4; - $self->{JobKey} = $JobKey; + $self->{JobKey} = $NewJob->GetKey(); return !1; } - $self->Redirect("/JobDetails.pl?Key=$JobKey"); # does not return + $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return exit; } -- 2.17.0

1 0

[PATCH] testbot/web: Don't hardcode the Submit.pl maximum filename length.
by Francois Gouget May 31, 2018

May 31, 2018

Also check it before even starting the upload. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index cf850788d..6451745a9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -33,9 +33,10 @@ use File::Basename; use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Branches; use WineTestBot::Config; -use WineTestBot::Jobs; use WineTestBot::Engine::Notify; +use WineTestBot::Jobs; use WineTestBot::PatchUtils; +use WineTestBot::Steps; use WineTestBot::Utils; use WineTestBot::VMs; @@ -609,10 +610,11 @@ sub OnPage1Next($) $FileName =~ m/^.*(\\|\/)(.*)/; $FileName = $2; } - if (100 - 32 - 1 < length($FileName)) + my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); + if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) { $self->{ErrField} = "File"; - $self->{ErrMessage} = "File: Name is too long"; + $self->{ErrMessage} = "The filename is too long"; return !1; } my $StagingFile = $self->GetTmpStagingFullPath($FileName); -- 2.17.0

1 0

[PATCH] testbot: Adjust the StepsTasks fields.
by Francois Gouget May 31, 2018

May 31, 2018

The StepTask class duplicates the Step and Task classes and its fields are mostly used in read-only mode so we don't care about their exact type too much, particularly for enums. Still, try to specify valid lengths so we don't get errors one day if Validate() is called. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/StepsTasks.pm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index ff94b1452..db0cc0667 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -162,20 +162,21 @@ sub CreateItem($) return WineTestBot::StepTask->new($self); } +# Note: To simplify maintenance replace enums with simple string fields. my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), - CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("TaskNo", "Task no", ! 1, 1, "N", 2), - CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 6), - CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 9), - CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), + CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), + CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("TaskNo", "Task no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 32), + 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", 64), - CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), + 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), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), ); sub CreateStepsTasks(;$$) -- 2.17.0

1 0

[PATCH 1/4] msi/tests: Simplify and combine environment variable tests.
by Zebediah Figura May 31, 2018

May 31, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 416 ++++++++---------------------------------------- 1 file changed, 64 insertions(+), 352 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ac94c38..5747c935 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -143,7 +143,6 @@ static const char install_exec_seq_dat[] = "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" "DuplicateFiles\t\t4500\n" - "WriteEnvironmentStrings\t\t4550\n" "CreateShortcuts\t\t4600\n" "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" @@ -186,7 +185,24 @@ static const char property_dat[] = "MSIFASTINSTALL\t1\n" "regdata15\t#x01\n"; -static const char environment_dat[] = +static const char env_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t100\n" + "FileCost\t\t200\n" + "CostFinalize\t\t300\n" + "InstallValidate\t\t400\n" + "InstallInitialize\t\t500\n" + "ProcessComponents\t\t600\n" + "WriteEnvironmentStrings\t\t700\n" + "RemoveEnvironmentStrings\t\t800\n" + "RegisterProduct\t\t900\n" + "PublishFeatures\t\t1000\n" + "PublishProduct\t\t1100\n" + "InstallFinalize\t\t1200\n"; + +static const char env_environment_dat[] = "Environment\tName\tValue\tComponent_\n" "s72\tl255\tL255\ts72\n" "Environment\tEnvironment\n" @@ -216,7 +232,9 @@ static const char environment_dat[] = "Var24\t+-MSITESTVAR19\t[~]2\tOne\n" "Var25\t+-MSITESTVAR20\t1\tOne\n" "Var26\t+-MSITESTVAR20\t2[~]\tOne\n" - "Var27\t+-MSITESTVAR21\t[~];1\tOne\n"; + "Var27\t+-MSITESTVAR21\t[~];1\tOne\n" + "Var28\t-MSITESTVAR22\t1\tOne\n" + "Var29\t-MSITESTVAR23\t2\tOne\n"; static const char service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -1428,65 +1446,6 @@ static const char riv_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; -static const char res_file_dat[] = - "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" - "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" - "File\tFile\n" - "envvar.txt\tenvvar\tenvvar.txt\t1000\t\t\t8192\t1\n"; - -static const char res_feature_dat[] = - "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" - "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" - "Feature\tFeature\n" - "envvar\t\t\tenvvar feature\t1\t2\tMSITESTDIR\t0\n"; - -static const char res_feature_comp_dat[] = - "Feature_\tComponent_\n" - "s38\ts72\n" - "FeatureComponents\tFeature_\tComponent_\n" - "envvar\tenvvar\n"; - -static const char res_component_dat[] = - "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" - "s72\tS38\ts72\ti2\tS255\tS72\n" - "Component\tComponent\n" - "envvar\t{45EE9AF4-E5D1-445F-8BB7-B22D4EEBD29E}\tMSITESTDIR\t0\t\tenvvar.txt\n"; - -static const char res_environment_dat[] = - "Environment\tName\tValue\tComponent_\n" - "s72\tl255\tL255\ts72\n" - "Environment\tEnvironment\n" - "var1\t=-MSITESTVAR1\t1\tenvvar\n" - "var2\t=+-MSITESTVAR2\t1\tenvvar\n" - "var3\t=MSITESTVAR3\t1\tenvvar\n" - "var4\t=-MSITESTVAR4\t\tenvvar\n" - "var5\t=MSITESTVAR5\t\tenvvar\n" - "Var6\t-MSITESTVAR6\t1;[~]\tenvvar\n" - "Var7\t-MSITESTVAR7\t[~];1\tenvvar\n" - "Var8\t-MSITESTVAR8\t1;[~]\tenvvar\n" - "Var9\t-MSITESTVAR9\t[~];1\tenvvar\n" - "Var10\t-MSITESTVAR10\t1\tenvvar\n" - "Var11\t-MSITESTVAR11\t2\tenvvar\n"; - -static const char res_install_exec_seq_dat[] = - "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "LaunchConditions\t\t100\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "CostFinalize\t\t1000\n" - "InstallValidate\t\t1400\n" - "InstallInitialize\t\t1500\n" - "ProcessComponents\t\t1600\n" - "RemoveFiles\t\t1700\n" - "InstallFiles\t\t2000\n" - "RemoveEnvironmentStrings\t\t3000\n" - "RegisterProduct\t\t5000\n" - "PublishFeatures\t\t5100\n" - "PublishProduct\t\t5200\n" - "InstallFinalize\t\t6000\n"; - static const char rci_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -1990,10 +1949,10 @@ static const msi_table env_tables[] = ADD_TABLE(feature), ADD_TABLE(feature_comp), ADD_TABLE(file), - ADD_TABLE(install_exec_seq), + ADD_TABLE(env_install_exec_seq), ADD_TABLE(media), ADD_TABLE(property), - ADD_TABLE(environment) + ADD_TABLE(env_environment) }; static const msi_table pp_tables[] = @@ -2287,19 +2246,6 @@ static const msi_table riv_tables[] = ADD_TABLE(property) }; -static const msi_table res_tables[] = -{ - ADD_TABLE(directory), - ADD_TABLE(res_component), - ADD_TABLE(res_feature), - ADD_TABLE(res_feature_comp), - ADD_TABLE(res_file), - ADD_TABLE(res_environment), - ADD_TABLE(res_install_exec_seq), - ADD_TABLE(media), - ADD_TABLE(property) -}; - static const msi_table rci_tables[] = { ADD_TABLE(directory), @@ -4969,27 +4915,10 @@ error: static void test_envvar(void) { - static const char *results[] = - { - "1;2", /* MSITESTVAR11 */ - "1", /* MSITESTVAR12 */ - "1;2", /* MSITESTVAR13 */ - ";1;", /* MSITESTVAR14 */ - ";;1;;", /* MSITESTVAR15 */ - " 1 ", /* MSITESTVAR16 */ - ";;2;;1", /* MSITESTVAR17 */ - "1;;2;;", /* MSITESTVAR18 */ - "1", /* MSITESTVAR19 */ - "1", /* MSITESTVAR20 */ - "1", /* MSITESTVAR21 */ - NULL - }; - UINT r; + char buffer[16]; + UINT r, i; HKEY env; LONG res; - DWORD type, size; - char buffer[16]; - UINT i; if (is_process_limited()) { @@ -4997,7 +4926,6 @@ static void test_envvar(void) return; } - create_test_files(); create_database(msifile, env_tables, sizeof(env_tables) / sizeof(msi_table)); res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL); @@ -5022,33 +4950,10 @@ static void test_envvar(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - type = REG_NONE; - size = sizeof(buffer); - buffer[0] = 0; - res = RegQueryValueExA(env, "MSITESTVAR1", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "Expected \"1\", got %s\n", buffer); - - res = RegDeleteValueA(env, "MSITESTVAR1"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - - type = REG_NONE; - size = sizeof(buffer); - buffer[0] = 0; - res = RegQueryValueExA(env, "MSITESTVAR2", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "Expected \"1\", got %s\n", buffer); - - res = RegDeleteValueA(env, "MSITESTVAR2"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - - res = RegDeleteValueA(env, "MSITESTVAR3"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - - res = RegDeleteValueA(env, "MSITESTVAR4"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(env, "MSITESTVAR1", "1"); + CHECK_REG_STR(env, "MSITESTVAR2", "1"); + CHECK_REG_STR(env, "MSITESTVAR3", "1"); + CHECK_REG_STR(env, "MSITESTVAR4", "1"); res = RegDeleteValueA(env, "MSITESTVAR5"); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); @@ -5068,46 +4973,50 @@ static void test_envvar(void) res = RegDeleteValueA(env, "MSITESTVAR10"); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - i = 11; - while (results[i - 11]) + CHECK_REG_STR(env, "MSITESTVAR11", "1;2"); + CHECK_REG_STR(env, "MSITESTVAR12", "1"); + CHECK_REG_STR(env, "MSITESTVAR13", "1;2"); + CHECK_REG_STR(env, "MSITESTVAR14", ";1;"); + CHECK_REG_STR(env, "MSITESTVAR15", ";;1;;"); + CHECK_REG_STR(env, "MSITESTVAR16", " 1 "); + CHECK_REG_STR(env, "MSITESTVAR17", ";;2;;1"); + CHECK_REG_STR(env, "MSITESTVAR18", "1;;2;;"); + CHECK_REG_STR(env, "MSITESTVAR19", "1"); + CHECK_REG_STR(env, "MSITESTVAR20", "1"); + CHECK_REG_STR(env, "MSITESTVAR21", "1"); + + res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(env, "MSITESTVAR23", 0, REG_SZ, (const BYTE *)"1", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(!r, "got %u\n", r); + + CHECK_DEL_REG_STR(env, "MSITESTVAR13", "1;2"); + CHECK_DEL_REG_STR(env, "MSITESTVAR14", ";1;"); + CHECK_DEL_REG_STR(env, "MSITESTVAR15", ";;1;;"); + CHECK_DEL_REG_STR(env, "MSITESTVAR16", " 1 "); +todo_wine { + CHECK_DEL_REG_STR(env, "MSITESTVAR17", "1"); + CHECK_DEL_REG_STR(env, "MSITESTVAR18", "1"); +} + CHECK_DEL_REG_STR(env, "MSITESTVAR23", "1"); + + for (i = 1; i <= 23; i++) { - char name[20]; - sprintf(name, "MSITESTVAR%d", i); - - type = REG_NONE; - size = sizeof(buffer); - buffer[0] = 0; - res = RegQueryValueExA(env, name, NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "%d: Expected ERROR_SUCCESS, got %d\n", i, res); - ok(type == REG_SZ, "%d: Expected REG_SZ, got %u\n", i, type); - ok(!lstrcmpA(buffer, results[i - 11]), "%d: Expected %s, got %s\n", i, results[i - 11], buffer); - - res = RegDeleteValueA(env, name); - ok(res == ERROR_SUCCESS, "%d: Expected ERROR_SUCCESS, got %d\n", i, res); - i++; + sprintf(buffer, "MSITESTVAR%i", i); + res = RegDeleteValueA(env, buffer); + ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %u\n", i, res); } - delete_pf("msitest\\cabout\\new\\five.txt", TRUE); - delete_pf("msitest\\cabout\\new", FALSE); - delete_pf("msitest\\cabout\\four.txt", TRUE); - delete_pf("msitest\\cabout", FALSE); - delete_pf("msitest\\changed\\three.txt", TRUE); - delete_pf("msitest\\changed", FALSE); - delete_pf("msitest\\first\\two.txt", TRUE); - delete_pf("msitest\\first", FALSE); - delete_pf("msitest\\filename", TRUE); - delete_pf("msitest\\one.txt", TRUE); - delete_pf("msitest\\service.exe", TRUE); - delete_pf("msitest\\service2.exe", TRUE); - delete_pf("msitest", FALSE); - error: RegDeleteValueA(env, "MSITESTVAR1"); RegDeleteValueA(env, "MSITESTVAR2"); RegDeleteValueA(env, "MSITESTVAR21"); RegCloseKey(env); - delete_test_files(); DeleteFileA(msifile); } @@ -6127,202 +6036,6 @@ error: DeleteFileA(msifile); } -static void test_remove_env_strings(void) -{ - UINT r; - LONG res; - HKEY key; - DWORD type, size; - char buffer[0x10]; - - if (is_process_limited()) - { - skip("process is limited\n"); - return; - } - - create_test_files(); - create_file("msitest\\envvar.txt", 1000); - create_database(msifile, res_tables, sizeof(res_tables) / sizeof(msi_table)); - - MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - - res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); - ok(!res, "failed to open environment key %d\n", res); - - RegSetValueExA(key, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR2", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR3", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR4", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR5", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR6", 0, REG_SZ, (const BYTE *)"1;2", 4); - RegSetValueExA(key, "MSITESTVAR7", 0, REG_SZ, (const BYTE *)"1;2", 4); - RegSetValueExA(key, "MSITESTVAR8", 0, REG_SZ, (const BYTE *)"2;1;0", 6); - RegSetValueExA(key, "MSITESTVAR9", 0, REG_SZ, (const BYTE *)"0;1;2", 6); - RegSetValueExA(key, "MSITESTVAR10", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR11", 0, REG_SZ, (const BYTE *)"1", 2); - - RegCloseKey(key); - - r = MsiInstallProductA(msifile, NULL); - if (r == ERROR_INSTALL_PACKAGE_REJECTED) - { - skip("Not enough rights to perform tests\n"); - goto error; - } - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); - ok(!res, "failed to open environment key %d\n", res); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR1", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR2", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR3", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR4", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR5", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - RegCloseKey(key); - - r = MsiInstallProductA(msifile, "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); - ok(!res, "failed to open environment key %d\n", res); - - res = RegQueryValueExA(key, "MSITESTVAR1", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - - res = RegQueryValueExA(key, "MSITESTVAR2", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR3", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR3"); - - res = RegQueryValueExA(key, "MSITESTVAR4", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR5", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR5"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR6", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "2"), "expected \"2\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR6"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR7", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "2"), "expected \"2\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR7"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR8", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "2;0"), "expected \"2;0\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR8"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR9", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "0;2"), "expected \"0;2\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR9"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR10", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR11", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR11"); - - ok(!delete_pf("msitest\\envvar.txt", TRUE), "file not removed\n"); - ok(!delete_pf("msitest", FALSE), "directory not removed\n"); - -error: - RegDeleteValueA(key, "MSITESTVAR1"); - RegDeleteValueA(key, "MSITESTVAR2"); - RegDeleteValueA(key, "MSITESTVAR3"); - RegDeleteValueA(key, "MSITESTVAR4"); - RegDeleteValueA(key, "MSITESTVAR5"); - RegDeleteValueA(key, "MSITESTVAR6"); - RegDeleteValueA(key, "MSITESTVAR7"); - RegDeleteValueA(key, "MSITESTVAR8"); - RegDeleteValueA(key, "MSITESTVAR9"); - RegDeleteValueA(key, "MSITESTVAR10"); - RegDeleteValueA(key, "MSITESTVAR11"); - RegCloseKey(key); - - DeleteFileA("msitest\\envvar.txt"); - delete_test_files(); - DeleteFileA(msifile); -} - static void test_register_class_info(void) { UINT r; @@ -6933,7 +6646,6 @@ START_TEST(action) test_remove_registry_values(); test_find_related_products(); test_remove_ini_values(); - test_remove_env_strings(); test_register_class_info(); test_register_extension_info(); test_register_progid_info(); -- 2.7.4

3 9

[PATCH 02/17] wbemdisp/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 31, 2018

May 31, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemdisp/tests/wbemdisp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 0c426c569a..171a91edb4 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -56,10 +56,10 @@ static void test_ParseDisplayName(void) ULONG eaten; } tests[] = { - { name1, S_OK, &IID_ISWbemServices, sizeof(name1)/sizeof(name1[0]) - 1 }, - { name2, S_OK, &IID_ISWbemServices, sizeof(name2)/sizeof(name2[0]) - 1 }, - { name3, S_OK, &IID_ISWbemObject, sizeof(name3)/sizeof(name3[0]) - 1 }, - { name4, S_OK, &IID_ISWbemObject, sizeof(name4)/sizeof(name4[0]) - 1 } + { name1, S_OK, &IID_ISWbemServices, ARRAY_SIZE( name1 ) - 1 }, + { name2, S_OK, &IID_ISWbemServices, ARRAY_SIZE( name2 ) - 1 }, + { name3, S_OK, &IID_ISWbemObject, ARRAY_SIZE( name3 ) - 1 }, + { name4, S_OK, &IID_ISWbemObject, ARRAY_SIZE( name4 ) - 1 } }; IParseDisplayName *displayname; IBindCtx *ctx; @@ -79,7 +79,7 @@ static void test_ParseDisplayName(void) hr = CreateBindCtx( 0, &ctx ); ok( hr == S_OK, "got %x\n", hr ); - for (i =0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i =0; i < ARRAY_SIZE( tests ); i++) { str = SysAllocString( tests[i].name ); eaten = 0xdeadbeef; -- 2.14.3

2 1

[PATCH 01/17] wbemprox/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 31, 2018

May 31, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/tests/query.c | 10 +++++----- dlls/wbemprox/tests/services.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d95fdd970b..cb911d7927 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -141,7 +141,7 @@ static void test_select( IWbemServices *services ) hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); - for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); @@ -168,7 +168,7 @@ static void test_associators( IWbemServices *services ) IEnumWbemClassObject *result; UINT i; - for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); @@ -433,7 +433,7 @@ static void test_Win32_Process( IWbemServices *services ) out = NULL; method = SysAllocString( getownerW ); - class = SysAllocStringLen( NULL, sizeof(fmtW)/sizeof(fmtW[0]) + 10 ); + class = SysAllocStringLen( NULL, ARRAY_SIZE( fmtW ) + 10 ); wsprintfW( class, fmtW, GetCurrentProcessId() ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); @@ -524,13 +524,13 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) WCHAR username[128]; DWORD len, count; - len = sizeof(compname) / sizeof(compname[0]); + len = ARRAY_SIZE( compname ); if (!GetComputerNameW( compname, &len )) compname[0] = 0; lstrcpyW( username, compname ); lstrcatW( username, backslashW ); - len = sizeof(username) / sizeof(username[0]) - lstrlenW( username ); + len = ARRAY_SIZE( username ) - lstrlenW( username ); if (!GetUserNameW( username + lstrlenW( username ), &len )) username[0] = 0; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index a6774751f3..da10e72fe1 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -164,7 +164,7 @@ static void test_IWbemLocator(void) } ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); - for (i = 0; i < sizeof(test) / sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE( test ); i++) { resource = SysAllocString( test[i].path ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); -- 2.14.3

2 1

[PATCH] testbot: Fix handling of test unit additions/removals in patch series.
by Francois Gouget May 31, 2018

May 31, 2018

The TestBot used to only analyse the last patch in the series to determine whether it impacts the tests or not. However patches to resource files and helper dlls require having an up-to-date list of the test units, and that list may be impacted by previous patches in the series. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 19 +++++++++++++++++-- testbot/lib/WineTestBot/Patches.pm | 4 +++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index a466df359..611d883e4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -127,9 +127,9 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($;$) +sub GetPatchImpact($;$$) { - my ($PatchFileName, $NoUnits) = @_; + my ($PatchFileName, $NoUnits, $PastImpacts) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); @@ -138,6 +138,21 @@ sub GetPatchImpact($;$) NoUnits => $NoUnits, Tests => {}, }; + + if ($PastImpacts) + { + foreach my $PastInfo (values %{$PastImpacts->{Tests}}) + { + if ($PastInfo->{Files}) + { + foreach my $File (keys %{$PastInfo->{Files}}) + { + _AddTest($Impacts, "$PastInfo->{Path}/$File", + $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); + } + } + } + } my ($Path, $Change); while (my $Line = <$fh>) { diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d4a5e0b17..71d735b08 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -132,7 +132,9 @@ sub Submit($$$) { my ($self, $PatchFileName, $IsSet) = @_; - my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id); + my $PastImpacts; + $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); + my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{UnitCount}) { $self->Disposition(($IsSet ? "Set" : "Patch") . -- 2.17.0

1 0

[PATCH] testbot/build: Tell Wine not to rebuild the WineTest executable.
by Francois Gouget May 31, 2018

May 31, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 322638eb1..6f461144e 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -148,7 +148,7 @@ sub BuildNative() # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . - " time ../wine/configure --enable-win64 --without-x --without-freetype && " . + " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -171,8 +171,8 @@ sub BuildCross($) # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . - " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . - " time make -j$ncpus programs/winetest " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . + " time make -j$ncpus buildtests" . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) { -- 2.17.0

1 0