December 2022 - Wine-Commits

Francois Gouget : testbot/web: Show the number of test units with failed tests.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: a318cfe5f94db5ecd46060caa6b96c3509b137c3 URL: https://gitlab.winehq.org/winehq/tools/-/commit/a318cfe5f94db5ecd46060caa6b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 18:20:30 2022 +0100 testbot/web: Show the number of test units with failed tests. --- testbot/web/JobDetails.pl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 506c7602..a4a250fa 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -50,7 +50,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures|FailedTestUnits)$/ ? "" : + return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures)$/ ? "" : $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -85,6 +85,10 @@ sub GenerateHeaderView($$$) { print "<a class='title' title='New / All'>Failures</a>"; } + elsif ($PropertyName eq "FailedTestUnits") + { + print "<a class='title' title='Failed test units'>Units</a>"; + } else { $self->SUPER::GenerateHeaderView($Row, $Col); @@ -164,6 +168,13 @@ sub GenerateDataView($$$) print "", $StepTask->TestFailures, "</a>"; return; } + if ($PropertyName eq "FailedTestUnits" and defined $StepTask->FailedTestUnits) + { + my $class = $StepTask->TestFailures ? "testfail" : "success"; + print "<a href='#k", $StepTask->GetKey(), "'>", + $StepTask->FailedTestUnits, "</a>"; + return; + } $self->SUPER::GenerateDataView($Row, $Col); }

1 0

Francois Gouget : testbot/web: Show the number of new failures and warnings.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: 4977ed2e9d702fc57e0f94fd9e25dc18a9f9c3b5 URL: https://gitlab.winehq.org/winehq/tools/-/commit/4977ed2e9d702fc57e0f94fd9e2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 28 03:01:16 2022 +0200 testbot/web: Show the number of new failures and warnings. This makes it easier to see which jobs and tasks have new failures. This also makes it obvious when a patch adds new compilation warnings. --- testbot/web/JobDetails.pl | 31 +++++++++++++++++++-- testbot/web/index.pl | 70 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 91 insertions(+), 10 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 035cba8c..506c7602 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -50,7 +50,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|Warnings|NewTestFailures|FailedTestUnits)$/ ? "" : + return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures|FailedTestUnits)$/ ? "" : $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -77,6 +77,14 @@ sub GenerateHeaderView($$$) { print "<a class='title' title='End Time'>Time</a>"; } + elsif ($PropertyName eq "Warnings") + { + print "<a class='title' title='New / All'>Warnings</a>"; + } + elsif ($PropertyName eq "TestFailures") + { + print "<a class='title' title='New / All'>Failures</a>"; + } else { $self->SUPER::GenerateHeaderView($Row, $Col); @@ -132,11 +140,28 @@ sub GenerateDataView($$$) GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); return; } + if ($PropertyName eq "Warnings" and defined $StepTask->Warnings) + { + print "<a href='#k", $StepTask->GetKey(), "'>"; + if (defined $StepTask->NewWarnings) + { + my $class = $StepTask->NewWarnings ? "testfail" : "success"; + print "", $StepTask->NewWarnings, " / "; + } + my $class = $StepTask->Warnings ? "testfail" : "success"; + print "", $StepTask->Warnings, "</a>"; + return; + } if ($PropertyName eq "TestFailures" and defined $StepTask->TestFailures) { + print "<a href='#k", $StepTask->GetKey(), "'>"; + if (defined $StepTask->NewTestFailures) + { + my $class = $StepTask->NewTestFailures ? "testfail" : "success"; + print "", $StepTask->NewTestFailures, " / "; + } my $class = $StepTask->TestFailures ? "testfail" : "success"; - print "<a href='#k", $StepTask->GetKey(), "'>", - $StepTask->TestFailures, "</a>"; + print "", $StepTask->TestFailures, "</a>"; return; } $self->SUPER::GenerateDataView($Row, $Col); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index a3b26ea9..087b80fa 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -25,6 +25,7 @@ package JobStatusBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::ValueFormatter; use WineTestBot::Branches; @@ -34,14 +35,33 @@ use WineTestBot::Utils; my $DAYS_DEFAULT = 4; +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + + # Add some extra columns + my @PropertyDescriptors; + foreach my $PropertyDescriptor (@{$self->{Collection}->GetPropertyDescriptors()}) + { + my $PropertyName = $PropertyDescriptor->GetName(); + next if ($PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/); + next if ($PropertyName eq "BranchName" and !CreateBranches()->MultipleBranchesPresent); + if ($PropertyName eq "Status") + { + push @PropertyDescriptors, CreateBasicPropertyDescriptor("Warnings", "Warnings", !1, !1, "N", 6); + } + push @PropertyDescriptors, $PropertyDescriptor; + } + + return \@PropertyDescriptors; +} + sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/ ? "" : - $PropertyName eq "Submitted" ? ("ro", "timetipdate") : - ($PropertyName eq "BranchName" and !CreateBranches()->MultipleBranchesPresent) ? "" : + return $PropertyName eq "Submitted" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -54,6 +74,14 @@ sub GenerateHeaderView($$$) { print "<a class='title' title='Higher values indicate a lower priority'>Nice</a>"; } + elsif ($PropertyName eq "Status") + { + print "<a class='title' title='Status - New / All failures'>Status</a>"; + } + elsif ($PropertyName eq "Warnings") + { + print "<a class='title' title='New / All warnings'>Warnings</a>"; + } elsif ($PropertyName eq "Submitted") { print "<a class='title' title='Date'>Submitted</a>"; @@ -86,6 +114,26 @@ sub GenerateDataView($$$) print $self->escapeHTML($Job->UserName); } } + elsif ($PropertyName eq "Warnings") + { + my $JobInfo = $self->{JobsInfo}->{$Job->Id}; + if (!exists $JobInfo->{Warnings}) + { + print " "; + } + else + { + my $DetailsLink = $self->GetDetailsLink($Row); + print "<a id='job", $Job->Id, "' href='", $self->escapeHTML($DetailsLink), "'>"; + if (exists $JobInfo->{NewWarnings}) + { + my $class = $JobInfo->{NewWarnings} ? "testfail" : "success"; + print "$JobInfo->{NewWarnings} / "; + } + my $class = $JobInfo->{Warnings} ? "testfail" : "success"; + print "$JobInfo->{Warnings}</a>"; + } + } elsif ($PropertyName eq "Status") { my $DetailsLink = $self->GetDetailsLink($Row); @@ -131,9 +179,14 @@ sub GenerateDataView($$$) if (exists $JobInfo->{TestFailures}) { + print $FailuresPrefix; + if (defined $JobInfo->{NewTestFailures}) + { + my $class = $JobInfo->{NewTestFailures} ? "testfail" : "success"; + print "$JobInfo->{NewTestFailures} / "; + } my $class = $JobInfo->{TestFailures} ? "testfail" : "success"; - my $s = $JobInfo->{TestFailures} == 1 ? "" : "s"; - print "$FailuresPrefix$JobInfo->{TestFailures} test failure$s"; + print "$JobInfo->{TestFailures}"; } elsif ($Status eq "completed") { @@ -320,8 +373,11 @@ sub GenerateBody($) $JobInfo->{DoneTasks}++; } - my $TestFailures = $Task->TestFailures; - $JobInfo->{TestFailures} += $TestFailures if (defined $TestFailures); + foreach my $Counter ("TestFailures", "NewTestFailures", "Warnings", "NewWarnings") + { + my $Value = $Task->$Counter; + $JobInfo->{$Counter} += $Value if (defined $Value); + } } $JobsCollectionBlock->GenerateList();

1 0

Francois Gouget : testbot/WineRun*: Set the new task failure and warning counters.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: de42885fb59d7d5f86b8dbf857fb6622eaa16c25 URL: https://gitlab.winehq.org/winehq/tools/-/commit/de42885fb59d7d5f86b8dbf857f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 28 03:00:51 2022 +0200 testbot/WineRun*: Set the new task failure and warning counters. --- testbot/bin/WineRunBuild.pl | 22 +++++++++++++++++++--- testbot/bin/WineRunReconfig.pl | 22 +++++++++++++++++++--- testbot/bin/WineRunTask.pl | 24 +++++++++++++++++++----- testbot/bin/WineRunWineTest.pl | 36 +++++++++++++++++++++++++++++++----- 4 files changed, 88 insertions(+), 16 deletions(-)

1 0

Francois Gouget : testbot/LogUtils: Don't try to match deleted known failures.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: 9201d1b1a63397c14e009993b05a0f8012198ba1 URL: https://gitlab.winehq.org/winehq/tools/-/commit/9201d1b1a63397c14e009993b05… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 30 16:19:47 2022 +0100 testbot/LogUtils: Don't try to match deleted known failures. Entries marked deleted will actually be deleted once nothing references them anymore. But that may not happen if the TestBot keeps trying to match them and potentially adding new references. --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 241eda46..c381906d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1469,6 +1469,7 @@ sub MatchLogFailures($$) my $ConfigName = $Task->VMName .":$LogInfo->{LogName}"; $LogFailures->{Collection} = CreateFailures(); + $LogFailures->{Collection}->AddFilter("BugStatus", ["deleted"], "<>"); foreach my $Failure (@{$LogFailures->{Collection}->GetItems()}) { # Ignore failures that don't apply to this configuration

1 0

Alexandre Julliard : packaging: Remove Fedora 35.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: e46e9bf8f59511d69c68fbb2e61eb2cc1f21637d URL: https://gitlab.winehq.org/winehq/tools/-/commit/e46e9bf8f59511d69c68fbb2e61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 14 20:19:11 2022 +0100 packaging: Remove Fedora 35. --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 - packaging/obs/yum.conf | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 722a8659..33bfcebd 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -198,7 +198,7 @@ publish_files () cd $basedir -distros="35 36 37 bullseye bookworm bionic focal jammy kinetic" +distros="36 37 bullseye bookworm bionic focal jammy kinetic" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 0c565b8b..c174ff25 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,5 +1,4 @@ + /fedora -+ /fedora/35 + /fedora/36 + /fedora/37 - /fedora/* diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index a75b7960..c600e2c4 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -4,10 +4,6 @@ debuglevel=0 logfile=/var/log/yum.log gpgcheck=1 -[fedora-35] -name = Fedora 35 -baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_35 - [fedora-36] name = Fedora 36 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/…

1 0

Tag vkd3d-1.6 : Alexandre Julliard : Release 1.6
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: vkd3d Branch: refs/tags/vkd3d-1.6 Tag: 5513cc393d787e68d936f69794b3fcbc2685c724 URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/5513cc393d787e68d936f69794b3fcb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 16:20:25 2022 +0100 Release 1.6

1 0

Henri Verbeet : build: Remove $(vkd3d_demos_shaders) from the distribution.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: vkd3d Branch: master Commit: 21302c09eb5d5912c09d95265d20481584ca3457 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/21302c09eb5d5912c09d95265d204… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 6 11:54:39 2022 +0100 build: Remove $(vkd3d_demos_shaders) from the distribution. These were removed in commits 3d85d77cedfd9e8aece1c1feb622d82425f7e9ee and 763f7dfa6196344da7c4fbb94dad9af42c26ac5b. --- Makefile.am | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 85cd4642..00e7e40e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,15 +31,6 @@ vkd3d_public_headers = \ include/vkd3d_utils.h \ include/vkd3d_windows.h -vkd3d_demos_shaders = \ - demos/gears.hlsl \ - demos/gears_ps_flat.h \ - demos/gears_ps_smooth.h \ - demos/gears_vs.h \ - demos/triangle.hlsl \ - demos/triangle_ps.h \ - demos/triangle_vs.h - vkd3d_tests = \ tests/vkd3d_api \ tests/vkd3d_common \ @@ -378,8 +369,6 @@ else @echo "widl is required to generate $@" endif -EXTRA_DIST += $(vkd3d_demos_shaders) - libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in Makefile $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \

1 0

Henri Verbeet : build: Add the demo shaders to the distribution.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: vkd3d Branch: master Commit: d5f810068b37a062aa9f538e62a8490286b71eaf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5f810068b37a062aa9f538e62a84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 6 11:58:24 2022 +0100 build: Add the demo shaders to the distribution. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 00e7e40e..e877c502 100644 --- a/Makefile.am +++ b/Makefile.am @@ -342,11 +342,11 @@ DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DL_LIBS@ @DEMO_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ bin_PROGRAMS += $(vkd3d_demos) -demos_vkd3d_gears_SOURCES = demos/gears.c +demos_vkd3d_gears_SOURCES = demos/gears.c demos/gears_hlsl.h demos_vkd3d_gears_CFLAGS = $(DEMOS_CFLAGS) demos_vkd3d_gears_LDADD = $(DEMOS_LDADD) -lm -demos_vkd3d_triangle_SOURCES = demos/triangle.c +demos_vkd3d_triangle_SOURCES = demos/triangle.c demos/triangle_hlsl.h demos_vkd3d_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_vkd3d_triangle_LDADD = $(DEMOS_LDADD) endif

1 0

Henri Verbeet : Release 1.6.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: vkd3d Branch: master Commit: 1eaf73147cd370e2d721285ed6f62ee3c6661a6d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1eaf73147cd370e2d721285ed6f62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 29 12:58:11 2022 +0100 Release 1.6. --- ANNOUNCE | 54 ++++++++++++++++++++++--------------- AUTHORS | 1 + Makefile.am | 6 ++--- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +-- libs/vkd3d/state.c | 4 +-- programs/vkd3d-compiler/main.c | 2 +- 11 files changed, 46 insertions(+), 33 deletions(-)

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in swapchain.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 14258485ea4ecec13c0385f5aad325a787a17926 URL: https://gitlab.winehq.org/wine/wine/-/commit/14258485ea4ecec13c0385f5aad325… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:20:10 2022 +0100 wined3d: Reduce usage of long integral types in swapchain.c. --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ab0660b9f6c..21ac353603a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1339,7 +1339,7 @@ static const struct wined3d_swapchain_ops swapchain_no3d_ops = }; static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_swapchain *swapchain, - enum wined3d_format_id format_id, enum wined3d_multisample_type *type, DWORD *quality) + enum wined3d_format_id format_id, enum wined3d_multisample_type *type, unsigned int *quality) { const struct wined3d_adapter *adapter; const struct wined3d_gl_info *gl_info;

1 0