March 2021 - Wine-Commits - list.winehq.org

Francois Gouget : winetest/dissect: Add support for WINETEST_TIME reports.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: tools Branch: master Commit: 700beb851be3d5864cc204e10438c10e7044fd16 URL: https://source.winehq.org/git/tools.git/?a=commit;h=700beb851be3d5864cc204e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 11 14:04:00 2021 +0100 winetest/dissect: Add support for WINETEST_TIME reports. WineTest reports would usually not have timing information but this keeps dissect in sync with the TestBot and it may be useful to get reports with detailed timing information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 797c204..304e9c9 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -610,64 +610,64 @@ while ($line = <IN>) { } } elsif (($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) or - $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) + $line =~ /^(.*?)($units_re)\.c:(\d+)(:[0-9.]* Subtest ([_.a-z0-9-]+).*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+)(:[0-9.]* Subtest ([_.a-z0-9-]+).*)$/) { my ($pollution, $l_unit, $l_num, $l_text, $l_subunit) = ($1, $2, $3, $4, $5); add_test_line("trace", escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". + get_source_link($l_unit, $l_num) . escapeHTML($l_text)); check_unit($l_unit, "subtest"); $units{$l_subunit} = 1; $units_re = join("|", keys %units); } elsif (($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/) or - $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/) + $line =~ /^(.*?)($units_re)\.c:(\d+)(:[0-9.]* Test (?:failed|succeeded inside todo block): .*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+)(:[0-9.]* Test (?:failed|succeeded inside todo block): .*)$/) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("failed", escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". + get_source_link($l_unit, $l_num) . escapeHTML($l_text)); check_unit($l_unit, "failure"); $failures++; } elsif (($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (Test marked todo: .*)$/) or - $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/) + $line =~ /^(.*?)($units_re)\.c:(\d+)(:[0-9.]* Test marked todo: .*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+)(:[0-9.]* Test marked todo: .*)$/) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("todo", escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". + get_source_link($l_unit, $l_num) . escapeHTML($l_text)); check_unit($l_unit, "todo"); $todo++; } elsif (($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (Tests skipped: .*)$/) or - $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/) + $line =~ /^(.*?)($units_re)\.c:(\d+)(:[0-9.]* Tests skipped: .*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+)(:[0-9.]* Tests skipped: .*)$/) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("skipped", escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". + get_source_link($l_unit, $l_num) . escapeHTML($l_text)); # Don't complain and don't count misplaced skips $skipped++ if ($units{$l_unit}); } elsif (($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (IgnoreExceptions=([01]).*)$/) or - $line =~ /^()([_.a-z0-9]+)\.c:(\d+): (IgnoreExceptions=([01]).*)$/) + $line =~ /^(.*?)($units_re)\.c:(\d+)(:[0-9.]* IgnoreExceptions=([01]).*)$/) or + $line =~ /^()([_.a-z0-9]+)\.c:(\d+)(:[0-9.]* IgnoreExceptions=([01]).*)$/) { my ($pollution, $l_unit, $l_num, $l_text, $l_ignore) = ($1, $2, $3, $4, $5); add_test_line("", escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". + get_source_link($l_unit, $l_num) . escapeHTML($l_text)); check_unit($l_unit, "IgnoreExceptions"); $ignore_exceptions = $l_ignore; } elsif (($unit ne "" and - $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /) or - $line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /) + $line =~ /([0-9a-f]+):($units_re):[0-9.]* unhandled exception [0-9a-fA-F]{8} at /) or + $line =~ /^([0-9a-f]+):([_.a-z0-9]+):[0-9.]* unhandled exception [0-9a-fA-F]{8} at /) { my ($l_pid, $l_unit) = ($1, $2); my $class = ""; @@ -699,8 +699,8 @@ while ($line = <IN>) { add_test_line($class, escapeHTML($line)); } elsif (($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) or - $line =~ /^()([_.a-z0-9]+)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) + $line =~ /^(.*?)($units_re)\.c:(\d+)(:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) or + $line =~ /^()([_.a-z0-9]+)\.c:(\d+)(:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) { my ($pollution, $l_unit, $l_num, $l_text, $l_pid) = ($1, $2, $3, $4, $5); my $class = ""; @@ -717,21 +717,21 @@ while ($line = <IN>) { $failures++; } add_test_line($class, escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". + get_source_link($l_unit, $l_num) . escapeHTML($l_text)); } elsif (($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/) or - $line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/) + $line =~ /^(.*?)($units_re)\.c:(\d+)(:[0-9.]* .*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+)(:[0-9.]* .*)$/) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("trace", escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". + get_source_link($l_unit, $l_num) . escapeHTML($l_text)); } elsif (($unit ne "" and - $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or - $line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) + $line =~ /([0-9a-f]+):($unit):[0-9.]* (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or + $line =~ /^([0-9a-f]+):([_a-z0-9]+):[0-9.]* (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) { my ($l_pid, $l_unit, $l_total, $l_todo, $l_failures, $l_skipped) = ($1, $2, $3, $4, $5, $6);

1 0

Francois Gouget : testbot/WineRun*: Trace the name of the VM the task is run on.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: tools Branch: master Commit: abd712a8d0c81a053612aaedef5fc357466e34bb URL: https://source.winehq.org/git/tools.git/?a=commit;h=abd712a8d0c81a053612aae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 12 01:57:57 2021 +0100 testbot/WineRun*: Trace the name of the VM the task is run on. The information is available by going to the job details page of that task but this helps keep track of the operations performed on a specific VM in the Engine log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ff13052..adb1959 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -168,7 +168,7 @@ my $VM = $Task->VM; my $Start = Time(); -LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; +LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 36b3e68..d5f2610 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -197,7 +197,7 @@ my $VM = $Task->VM; my $Start = Time(); -LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; +LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 94757bf..3a267ac 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -194,7 +194,7 @@ my $VM = $Task->VM; my $Start = Time(); -LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; +LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; #

1 0

Francois Gouget : testbot/PatchUtils: Fix handling of renames.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: tools Branch: master Commit: af6cc2feff12b6cb40d45bb68f8c29f3485e3639 URL: https://source.winehq.org/git/tools.git/?a=commit;h=af6cc2feff12b6cb40d45bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 11 14:01:43 2021 +0100 testbot/PatchUtils: Fix handling of renames. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50719 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 37b1b77..796457a 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -389,7 +389,9 @@ sub GetPatchImpacts($) } elsif ($Line =~ m~^\+\+\+ \w+/([^\s]+)$~) { - _HandleFile($Impacts, $1, $Change || "modify"); + my $PlusPath = $1; + _HandleFile($Impacts, $Path, "rm") if (defined $Path and $Path ne $PlusPath); + _HandleFile($Impacts, $PlusPath, $Change || "modify"); $Path = undef; $Change = ""; }

1 0

Francois Gouget : testbot/LibvirtTool: Don't unset the VM name before reporting it is wrong.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: tools Branch: master Commit: 46bbf2334203b5b58f0800b2ca79367d0e8df915 URL: https://source.winehq.org/git/tools.git/?a=commit;h=46bbf2334203b5b58f0800b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 12 01:58:22 2021 +0100 testbot/LibvirtTool: Don't unset the VM name before reporting it is wrong. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index be6c575..f3ea198 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -120,14 +120,15 @@ if (!defined $Usage) } else { - $VMKey = WineTestBot::VM::UntaintName($VMKey); - if (!defined $VMKey) + my $UnTainted = WineTestBot::VM::UntaintName($VMKey); + if (!defined $UnTainted) { Error "'$VMKey' is not a valid VM name\n"; $Usage = 2; } else { + $VMKey = $UnTainted; $VM = CreateVMs()->GetItem($VMKey); if (!defined $VM) {

1 0

Francois Gouget : testbot: Add support for running the tests with WINETEST_TIME.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: tools Branch: master Commit: bb6d3d7c5639b898e5d9df61e703216df380b608 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bb6d3d7c5639b898e5d9df6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 11 15:32:42 2021 +0100 testbot: Add support for running the tests with WINETEST_TIME. This allows getting timing information on the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 4 ++++ testbot/bin/WineRunWineTest.pl | 4 ++++ testbot/ddl/update44.sql | 8 ++++++++ testbot/ddl/winetestbot.sql | 1 + testbot/lib/WineTestBot/Steps.pm | 2 ++ testbot/web/Submit.pl | 8 +++++++- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 6056806..36b3e68 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -425,6 +425,10 @@ my $Keepalive; my $Timeout = $Task->Timeout; my $Script = "set WINETEST_DEBUG=" . $Step->DebugLevel . "\r\n"; +if ($Step->LogTime) +{ + $Script .= "set WINETEST_TIME=1\r\n"; +} if ($Step->ReportSuccessfulTests) { $Script .= "set WINETEST_REPORT_SUCCESS=1\r\n"; diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 7892bca..94757bf 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -422,6 +422,10 @@ if (defined $FileName) my $Script = "#!/bin/sh\n". "( set -x\n". " export WINETEST_DEBUG=". $Step->DebugLevel ."\n"; +if ($Step->LogTime) +{ + $Script .= " export WINETEST_TIME=1\n"; +} if ($Step->ReportSuccessfulTests) { $Script .= " export WINETEST_REPORT_SUCCESS=1\n"; diff --git a/testbot/ddl/update44.sql b/testbot/ddl/update44.sql new file mode 100644 index 0000000..670d3bc --- /dev/null +++ b/testbot/ddl/update44.sql @@ -0,0 +1,8 @@ +USE winetestbot; + +ALTER TABLE Steps + ADD LogTime ENUM('Y', 'N') NULL DEFAULT 'N' + AFTER DebugLevel; + +ALTER TABLE Steps + ALTER LogTime DROP DEFAULT; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 533941d..1794b25 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -138,6 +138,7 @@ CREATE TABLE Steps FileName VARCHAR(100) NULL, FileType ENUM('none', 'exe32', 'exe64', 'patch') NOT NULL, DebugLevel INT(2) NOT NULL, + LogTime ENUM('Y', 'N') NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, PRIMARY KEY (JobId, No), FOREIGN KEY (JobId) REFERENCES Jobs(Id), diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0943375..921077b 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -91,6 +91,7 @@ sub InitializeNew($$) $self->Type("single"); $self->FileType("none"); $self->DebugLevel(1); + $self->LogTime(!1); $self->ReportSuccessfulTests(!1); $self->SUPER::InitializeNew($Collection); @@ -240,6 +241,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("FileName", "File", !1, !1, "A", 100), CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patch']), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("LogTime", "Timestamp traces (WINETEST_TIME)", !1, 1, "B", 1), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), ); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 5e9a61e..68978f0 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -519,7 +519,8 @@ sub _initialize($$$) # Load the Page 3 parameters $self->_GetParams("TestExecutable", "CmdLineArg", "NoCmdLineArgWarn", - "Run32", "Run64", "DebugLevel", "ReportSuccessfulTests"); + "Run32", "Run64", "DebugLevel", "LogTime", + "ReportSuccessfulTests"); $self->{DebugLevel} = 1 if (!defined $self->{DebugLevel}); # Load the Page 4 parameters @@ -585,6 +586,7 @@ sub _GenerateStateFields($) $self->_GenerateStateField("Run32"); $self->_GenerateStateField("Run64"); $self->_GenerateStateField("DebugLevel"); + $self->_GenerateStateField("LogTime"); $self->_GenerateStateField("ReportSuccessfulTests"); } } @@ -698,6 +700,7 @@ sub GetPropertyDescriptors($) CreateBasicPropertyDescriptor("Run32", "Run the 32 bit tests on Windows", !1, 1, "B", 1), CreateBasicPropertyDescriptor("Run64", "Run the 64 bit tests on Windows", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("LogTime", "Timestamp traces (WINETEST_TIME)", !1, 1, "B", 1), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1); } @@ -1068,6 +1071,7 @@ sub OnPage3Prev($) # Set to 0 instead of undef to record the user preference $self->{Run32} ||= 0; $self->{Run64} ||= 0; + $self->{LogTime} ||= 0; $self->{ReportSuccessfulTests} ||= 0; $self->_SetPage(2); @@ -1195,6 +1199,7 @@ sub _SubmitJob($$) $TestStep->FileType("exe$Bits"); $TestStep->Type("single"); $TestStep->DebugLevel($self->{DebugLevel}); + $TestStep->LogTime(defined $self->{LogTime}); $TestStep->ReportSuccessfulTests(defined $self->{ReportSuccessfulTests}); my $Tasks = $TestStep->Tasks; @@ -1218,6 +1223,7 @@ sub _SubmitJob($$) $WineStep->FileType($self->{FileType}); $WineStep->Type("single"); $WineStep->DebugLevel($self->{DebugLevel}); + $WineStep->LogTime(defined $self->{LogTime}); $WineStep->ReportSuccessfulTests(defined $self->{ReportSuccessfulTests}); my $Tasks = $WineStep->Tasks;

1 0

Francois Gouget : testbot/LogUtils: Add support for WINETEST_TIME reports.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: tools Branch: master Commit: 976d8d614f10ffeb54a151e62677338747de48fb URL: https://source.winehq.org/git/tools.git/?a=commit;h=976d8d614f10ffeb54a151e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 11 15:02:28 2021 +0100 testbot/LogUtils: Add support for WINETEST_TIME reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 47 +++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ed5dd74..e93eac0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -314,14 +314,14 @@ sub GetReportLineCategory($) { my ($Line) = @_; - if ($Line =~ /: Test marked todo: /) + if ($Line =~ /:[0-9]* Test marked todo: /) { return "todo"; } - if ($Line =~ /: Tests skipped: / or + if ($Line =~ /:[0-9.]* Tests skipped: / or $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped / or - $Line =~ /^[_.a-z0-9-]+:\d+: Line has been silenced after \d+ occurrences$/ or - $Line =~ /^[0-9a-f]+:[_a-z0-9]+: Silenced \d+ todos, \d+ skips and \d+ traces\.$/) + $Line =~ /^[_.a-z0-9-]+:\d+:[0-9.]* Line has been silenced after \d+ occurrences$/ or + $Line =~ /^[0-9a-f]+:[_a-z0-9]+:[0-9.]* Silenced \d+ todos, \d+ skips and \d+ traces\.$/) { return "skip"; } @@ -558,8 +558,8 @@ sub ParseWineTestReport($$$) $Cur->{Group} = undef; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Subtest ([_a-z0-9]+)/) or - $Line =~ /^([_a-z0-9]+)\.c:\d+: Subtest ([_a-z0-9]+)/) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* Subtest ([_a-z0-9]+)/) or + $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Subtest ([_a-z0-9]+)/) { my ($Unit, $SubUnit) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "$SubUnit subtest"); @@ -567,23 +567,23 @@ sub ParseWineTestReport($$$) $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or - $Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): /) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* Test (?:failed|succeeded inside todo block): /) or + $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test marked todo: /) or - $Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: /) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* Test marked todo: /) or + $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test marked todo: /) { _CheckUnit($LogInfo, $Cur, $1, "todo"); $Cur->{LineTodos}++; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Tests skipped: /) or - $Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: /) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* Tests skipped: /) or + $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Tests skipped: /) { my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they @@ -604,16 +604,16 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: IgnoreExceptions=([01])/) or - $Line =~ /^([_.a-z0-9]+)\.c:\d+: IgnoreExceptions=([01])/) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* IgnoreExceptions=([01])/) or + $Line =~ /^([_.a-z0-9]+)\.c:\d+:[0-9.]* IgnoreExceptions=([01])/) { my ($Unit, $Ignore) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "ignore exceptions"); $Cur->{IgnoreExceptions} = $Ignore; } elsif (($Cur->{Unit} ne "" and - $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /) or - $Line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /) + $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}):[0-9.]* unhandled exception [0-9a-fA-F]{8} at /) or + $Line =~ /^([0-9a-f]+):([_.a-z0-9]+):[0-9.]* unhandled exception [0-9a-fA-F]{8} at /) { my ($Pid, $Unit) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); @@ -641,8 +641,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or - $Line =~ /^([_.a-z0-9]+)\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or + $Line =~ /^([_.a-z0-9]+)\.c:\d+:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) { my ($Unit, $Pid) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); @@ -659,8 +659,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Unit} ne "" and - $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or - $Line =~ /^([0-9a-f]+):([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) + $Line =~ /([0-9a-f]+):($Cur->{Unit}):[0-9.]* \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or + $Line =~ /^([0-9a-f]+):([_a-z0-9]+):[0-9.]* \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) { my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); @@ -1143,15 +1143,16 @@ sub _GetLineKey($) $Line =~ s/ +$//; # Remove the line number - $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block):)/$1$2/ + $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( Test (?:failed|succeeded inside todo block):)/$1$2/ or $Line =~ s/^([._a-zA-Z0-9-]+:)\d+(: recipe for target )/$1$2/ # Remove the crash code address: it changes whenever the test is recompiled or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/ # or the process id in Wine's exc_filter() lines - or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/ + or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+:)[0-9.]*( unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1$2/ # or child process id - or $Line =~ s/^([_a-z0-9]+\.c:)\d+:( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ + or $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ + # The exact amount of data printed does not change the error or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/;

1 0

Zebediah Figura : build: Enable -Winit-self.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: vkd3d Branch: master Commit: ed44a2bcf07cb9799fdc28c593d170d7e307b098 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ed44a2bcf07cb9799fdc28c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 11 16:27:34 2021 -0600 build: Enable -Winit-self. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index b7902b6..2005c76 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-std=c99]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) + VKD3D_CHECK_CFLAGS([-Winit-self]) VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla])

1 0

Gabriel Ivăncescu : jscript/tests: Add more tests for setting prototype to different builtin types.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 0ae1669ec2798193b11fd2d2ac74d51203f673b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ae1669ec2798193b11fd2d2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Mar 11 18:01:10 2021 +0200 jscript/tests: Add more tests for setting prototype to different builtin types. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 94c33295abb..fa8407cecea 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1887,6 +1887,24 @@ ok(!tmp.hasOwnProperty("y"), "tmp has 'y' property"); ok(!tmp.propertyIsEnumerable("y"), "tmp has 'y' property enumerable"); ok(tmp.toString() == "[object Object]", "tmp.toString returned " + tmp.toString()); +testNullPrototype.prototype = 42; +tmp = new testNullPrototype(); +ok(tmp.hasOwnProperty("x"), "tmp does not have 'x' property"); +ok(!tmp.hasOwnProperty("y"), "tmp has 'y' property"); +ok(tmp.toString() == "[object Object]", "tmp.toString returned " + tmp.toString()); + +testNullPrototype.prototype = true; +tmp = new testNullPrototype(); +ok(tmp.hasOwnProperty("x"), "tmp does not have 'x' property"); +ok(!tmp.hasOwnProperty("y"), "tmp has 'y' property"); +ok(tmp.toString() == "[object Object]", "tmp.toString returned " + tmp.toString()); + +testNullPrototype.prototype = "foobar"; +tmp = new testNullPrototype(); +ok(tmp.hasOwnProperty("x"), "tmp does not have 'x' property"); +ok(!tmp.hasOwnProperty("y"), "tmp has 'y' property"); +ok(tmp.toString() == "[object Object]", "tmp.toString returned " + tmp.toString()); + function do_test() {} function nosemicolon() {} nosemicolon(); function () {} nosemicolon();

1 0

Gabriel Ivăncescu : jscript: Use default object prototype if it's null.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: ba1f47a77043e8dd214ccdd0b0ee7c76f4ca7467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba1f47a77043e8dd214ccdd0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Mar 11 18:01:09 2021 +0200 jscript: Use default object prototype if it's null. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 3 +++ dlls/jscript/tests/lang.js | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f3eba68b9a4..a1a1af5a141 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1855,6 +1855,9 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built if(is_object_instance(val) && get_object(val)) prot = iface_to_jsdisp(get_object(val)); + else + prot = ctx->object_prototype; + jsval_release(val); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 211ae2f0373..94c33295abb 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1878,6 +1878,14 @@ testNullPrototype.prototype = nullDisp; tmp = new testNullPrototype(); ok(tmp.x === 13, "tmp.x !== 13"); ok(!("y" in tmp), "tmp has 'y' property"); +ok(!tmp.hasOwnProperty("y"), "tmp has 'y' property"); +ok(!tmp.propertyIsEnumerable("y"), "tmp has 'y' property enumerable"); +ok(tmp.toString() == "[object Object]", "tmp.toString returned " + tmp.toString()); +testNullPrototype.prototype = null; +tmp = new testNullPrototype(); +ok(!tmp.hasOwnProperty("y"), "tmp has 'y' property"); +ok(!tmp.propertyIsEnumerable("y"), "tmp has 'y' property enumerable"); +ok(tmp.toString() == "[object Object]", "tmp.toString returned " + tmp.toString()); function do_test() {} function nosemicolon() {} nosemicolon();

1 0

Gabriel Ivăncescu : jscript: Store the object prototype in the script context.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: eb43d59e8e007924f472a2382955b8df7c6e8f27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb43d59e8e007924f472a238… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Mar 11 18:01:08 2021 +0200 jscript: Store the object prototype in the script context. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 7 +++---- dlls/jscript/jscript.c | 5 +++++ dlls/jscript/jscript.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 735e188e1bd..33869cd5fc6 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1055,7 +1055,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) HRESULT init_global(script_ctx_t *ctx) { unsigned const_flags = ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? 0 : PROPF_WRITABLE; - jsdisp_t *math, *object_prototype, *constr; + jsdisp_t *math, *constr; HRESULT hres; if(ctx->global) @@ -1065,12 +1065,11 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = create_object_prototype(ctx, &object_prototype); + hres = create_object_prototype(ctx, &ctx->object_prototype); if(FAILED(hres)) return hres; - hres = init_constructors(ctx, object_prototype); - jsdisp_release(object_prototype); + hres = init_constructors(ctx, ctx->object_prototype); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c5c23889f04..67a25d1714b 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -483,6 +483,11 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->site = NULL; } + if(This->ctx->object_prototype) { + jsdisp_release(This->ctx->object_prototype); + This->ctx->object_prototype = NULL; + } + if(This->ctx->global) { jsdisp_release(This->ctx->global); This->ctx->global = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b590e1a7441..d7d9dd7a4e3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -451,6 +451,7 @@ struct _script_ctx_t { jsdisp_t *uri_error_constr; jsdisp_t *number_constr; jsdisp_t *object_constr; + jsdisp_t *object_prototype; jsdisp_t *regexp_constr; jsdisp_t *string_constr; jsdisp_t *vbarray_constr;

1 0