Module: tools
Branch: master
Commit: 4685e47d431a0945390931f8940e89fe4b53d6b3
URL: https://source.winehq.org/git/tools.git/?a=commit;h=4685e47d431a0945390931f…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Mon Oct 28 07:13:19 2019 +0100
testbot: Add a function to check the TestAgentd version.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/bin/LibvirtTool.pl | 3 +--
testbot/lib/WineTestBot/TestAgent.pm | 21 ++++++++++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index 127c15c..bc45533 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -392,8 +392,7 @@ sub SetupTestAgentd($$$$)
# We want 'TestAgentd --detach --show-restarts' on Windows but this was
# not supported before this version and changing how the server is started
# is too complex.
- $Version = sprintf("%02d.%02d", $1, $2);
- if ($Version lt "01.07")
+ if (!$TA->HasMinVersion(1, 7))
{
FatalError("The TestAgent server is too old to be upgraded: $Version\n");
}
diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index a4d32ec..6c4e644 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -1081,16 +1081,27 @@ sub GetVersion($)
{
my ($self) = @_;
- if (!$self->{agentversion})
- {
- # Retrieve the server version
- $self->_Connect();
- }
+ # Retrieve the server version
+ $self->_Connect() if (!$self->{agentversion});
+
# And return the version we got.
# If the connection failed it will be undef as expected.
return $self->{agentversion};
}
+sub HasMinVersion($$$)
+{
+ my ($self, $MinMajor, $MinMinor) = @_;
+
+ # Retrieve the server version
+ $self->_Connect() if (!$self->{agentversion});
+
+ return undef if (!$self->{agentversion});
+ return undef if ($self->{agentversion} !~ / ([0-9]+)\.([0-9]+)$/);
+ my ($Major, $Minor) = ($1, $2);
+ return (($Major > $MinMajor) or ($Major == $MinMajor and $Minor >= $MinMinor));
+}
+
our $SENDFILE_EXE = 1;
sub _SendStringOrFile($$$$$$)
Module: wine
Branch: master
Commit: e90c145020aee5aa91256c6f9b338da5374f31df
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e90c145020aee5aa91256c6f…
Author: Zebediah Figura <z.figura12(a)gmail.com>
Date: Fri Oct 25 12:19:48 2019 -0500
gameux/tests: Get rid of registry value tests.
Where gameux stores registry values is an implementation detail, and
subject to change. There's no reason to test it, unless an application
relies on it.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
dlls/gameux/tests/gameexplorer.c | 517 +--------------------------------------
1 file changed, 12 insertions(+), 505 deletions(-)
Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e90c145020aee5aa9125…
Module: wine
Branch: master
Commit: d681deb3e5cff310ed3966f670ca2119e581975c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d681deb3e5cff310ed3966f6…
Author: Sven Baars <sven.wine(a)gmail.com>
Date: Sat Oct 26 00:06:20 2019 +0200
mstask/tests: Wait a bit longer for tasks to start and terminate.
Signed-off-by: Sven Baars <sven.wine(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
dlls/mstask/tests/task.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c
index 6195194d61..a9957117e9 100644
--- a/dlls/mstask/tests/task.c
+++ b/dlls/mstask/tests/task.c
@@ -626,7 +626,7 @@ static void test_Run(void)
* This is how it's supposed to look like in the application
* (the loop should be infinite):
*/
- for (i = 0; i < 3; i++)
+ for (i = 0; i < 5; i++)
{
hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task);
ok(hr == S_OK, "Activate error %#x\n", hr);
@@ -661,7 +661,7 @@ static void test_Run(void)
* This is how it's supposed to look like in the application
* (the loop should be infinite):
*/
- for (i = 0; i < 3; i++)
+ for (i = 0; i < 5; i++)
{
hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task);
ok(hr == S_OK, "Activate error %#x\n", hr);