February 2022 - Wine-devel - list.winehq.org

[tools] testbot/WineRunReconfig: Use rebase when updating the TestBot source.
by Francois Gouget 14 Feb '22

14 Feb '22

The TestBot source should be unmodified so there should be no difference between 'git merge' and 'git rebase'. If there are local patches (for debugging?) rebase will keep them more visible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This avoids a git warning. testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9bd9429930..c91966d385 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -362,7 +362,7 @@ if ($Step->FileType ne "none") my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". - " git pull &&\n". + " git pull --rebase &&\n". " ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); -- 2.30.2

1 0

[tools] testbot/Janitor: Make the TestLauncher and WineTest matches stricter.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c68920e7c5..1b5bb33c34 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -321,8 +321,8 @@ if (opendir(my $dh, "$DataDir/latest")) # Needed to update Windows VMs next if ($Entry eq "TestAgentd.exe"); # Needed to run the tests - next if ($Entry =~ /^TestLauncher[0-9]*\.exe$/); - next if ($Entry =~ /^winetest[0-9]*-latest\.exe$/); + next if ($Entry =~ /^TestLauncher(?:32|64)\.exe$/); + next if ($Entry =~ /^winetest(?:64)?-latest\.exe$/); $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/latest/$1"; -- 2.30.2

1 0

[tools] testbot/WineRunReconfig: Only the build VMs produce TestAgentd.
by Francois Gouget 14 Feb '22

14 Feb '22

Usually this is not an issue because the TestBot server has the TestAgentd.exe binary and the build log does not contain the "Updated TestAgentd.exe" line. But during the initial setup the TestBot server would still try to download TestAgentd.exe from the Wine VMs which would cause a failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Also I apparently manually built TestAgentd.exe when preparing the Wine VMs (or WineReconfig.pl used to do so) so they do have an (out of date) binary available for download. testbot/bin/WineRunReconfig.pl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c6f2342916..373e657dc4 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -457,11 +457,20 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq "completed") { use File::Copy; - foreach my $FileName ("../src/testagentd/TestAgentd.exe", - "../src/TestLauncher/TestLauncher32.exe", - "../src/TestLauncher/TestLauncher64.exe", - "latest/winefiles.txt", - "latest/wine-parentsrc.txt") + my @FileNames = ( + # TestLauncher is used by both Windows and Wine VMs + "../src/TestLauncher/TestLauncher32.exe", + "../src/TestLauncher/TestLauncher64.exe", + # Needed by the TestBot server + "latest/winefiles.txt", + "latest/wine-parentsrc.txt", + ); + if ($VM->Type eq "build") + { + # Only needed for the Windows VMs and only built by the build VMs. + push @FileNames, "../src/testagentd/TestAgentd.exe"; + } + foreach my $FileName (@FileNames) { my $BaseName = basename($FileName); if ($FileName !~ m~^latest/~ and !$LogInfo->{$BaseName} and -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Move waiting for the X session start to its own function.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 43 ++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e2f2fd3c46..ef94a2be09 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -441,6 +441,30 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub WaitForSession($) +{ + my ($TA) = @_; + + if ($VM->Type eq "wine") + { + # For Wine VMs we have to wait some more for the X session to start. + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + FatalError("Could not check for the $VMKey X session\n") if (!$Pid); + + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the $VMKey X session\n"); + } + FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); + } + } +} + sub SetupTestAgentd($$$) { my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; @@ -506,24 +530,7 @@ sub SetupTestAgentd($$$) FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); } - if ($Booting and $VM->Type eq "wine") - { - # Make sure the X session has had time to start - Debug(Elapsed($Start), " Waiting for the X session\n"); - LogMsg "Waiting for the $VMKey X session\n"; - my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - FatalError("Could not check for the $VMKey X session\n") if (!$Pid); - - if (!defined $TA->Wait($Pid, $SleepAfterBoot)) - { - my $ErrMessage = $TA->GetLastError(); - if ($ErrMessage =~ /timed out waiting for the child process/) - { - FatalError("Timed out waiting for the $VMKey X session\n"); - } - FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); - } - } + WaitForSession($TA) if ($Booting); if ($ResetStartCount) { -- 2.30.2

1 0

[PATCH 5/6] win32u: Move MessageBeep implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 12 +----------- dlls/user32/message.c | 5 +---- dlls/win32u/driver.c | 19 ++++++++++++++++--- dlls/win32u/sysparams.c | 10 ++++++++++ include/ntuser.h | 1 + 5 files changed, 29 insertions(+), 18 deletions(-)

2 1

[PATCH 4/6] win32u: Move NtUserSetCursorPos implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

2 1

[PATCH 3/6] win32u: Move GetClipCursor implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 27 +-------------------------- dlls/win32u/cursoricon.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 4 ++++ include/ntuser.h | 1 + 5 files changed, 36 insertions(+), 26 deletions(-)

2 1

[PATCH 2/6] win32u: Move NtUserClipCursor implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

2 1

[PATCH 1/6] win32u: Move monitor_from_rect implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 79 +---------------------------------------- dlls/win32u/sysparams.c | 68 +++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 70 insertions(+), 78 deletions(-)

2 1

[PATCH 1/2] msvcirt/tests: Fix uninitialized variable warning.
by Piotr Caban 14 Feb '22

14 Feb '22

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

3 2