wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Francois Gouget : testbot/WineRun*: Improve the VM and Step validation.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: tools Branch: master Commit: bd10370745d91302ef7c4af283e2f09df62a446b URL: https://source.winehq.org/git/tools.git/?a=commit;h=bd10370745d91302ef7c4af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 15:00:30 2018 +0200 testbot/WineRun*: Improve the VM and Step validation. Check that the VM is of the expected type. Also the VM should always be powered on (for powered off snapshots LibvirtTool.pl is responsible for powering on the VM), even when debugging. Move the Step validation next to the VM one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 15 ++++++++++++--- testbot/bin/WineRunReconfig.pl | 15 ++++++++++++--- testbot/bin/WineRunTask.pl | 24 ++++++++++++++---------- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 60af32c..ff04ded 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -309,18 +309,27 @@ sub FatalTAError($$) # -# Check the VM +# Check the VM and Step # -if (!$Debug and $VM->Status ne "running") +if ($VM->Type ne "build") +{ + FatalError("This is not a build VM! (" . $VM->Type . ")\n"); +} +elsif (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif ($Debug and !$VM->GetDomain()->IsPoweredOn()) +elsif (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } +if ($Step->FileType ne "patchdlls") +{ + FatalError("Unexpected file type '". $Step->FileType ."' found\n"); +} + # # Figure out what to build diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2e338c9..23b038a 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -309,18 +309,27 @@ sub FatalTAError($$) # -# Check the VM +# Check the VM and Step # -if (!$Debug and $VM->Status ne "running") +if ($VM->Type ne "build") +{ + FatalError("This is not a build VM! (" . $VM->Type . ")\n"); +} +elsif (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif ($Debug and !$VM->GetDomain()->IsPoweredOn()) +elsif (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } +if ($Step->FileType ne "none") +{ + FatalError("Unexpected file type '". $Step->FileType ."' found\n"); +} + # # Run the build diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 37c63b4..ff8aab9 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -364,18 +364,27 @@ sub FatalTAError($$;$) # -# Check the VM +# Check the VM and Step # -if (!$Debug and $VM->Status ne "running") +if ($VM->Type ne "win32" and $VM->Type ne "win64") +{ + FatalError("This is not a Windows VM! (" . $VM->Type . ")\n"); +} +elsif (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif ($Debug and !$VM->GetDomain()->IsPoweredOn()) +elsif (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } +if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64") +{ + FatalError("Unexpected file type '". $Step->FileType ."' found\n"); +} + # # Setup the VM @@ -395,11 +404,6 @@ if (!$TA->SetTime()) } } -my $FileType = $Step->FileType; -if ($FileType ne "exe32" && $FileType ne "exe64") -{ - FatalError("Unexpected file type $FileType found\n"); -} my $FileName = $Step->FileName; Debug(Elapsed($Start), " Sending '". $Step->GetFullFileName() ."'\n"); if (!$TA->SendFile($Step->GetFullFileName(), $FileName, 0)) @@ -418,7 +422,7 @@ if ($Step->ReportSuccessfulTests) my $IsWineTest = 1; if ($Step->Type eq "single") { - my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; + my $TestLauncher = "TestLauncher" . ($Step->FileType eq "exe64" ? "64" : "32") . ".exe"; Debug(Elapsed($Start), " Sending 'latest/$TestLauncher'\n"); if (!$TA->SendFile("$DataDir/latest/$TestLauncher", $TestLauncher, 0)) { @@ -450,7 +454,7 @@ elsif ($Step->Type eq "suite") $Tag =~ s/[^a-zA-Z0-9]/-/g; if ($VM->Type eq "win64") { - $Tag .= "-" . ($FileType eq "exe64" ? "64" : "32"); + $Tag .= "-" . ($Step->FileType eq "exe64" ? "64" : "32"); } if (defined($WebHostName)) {

1 0

Francois Gouget : testbot: Build the per-module test unit list from the list of Wine files.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: tools Branch: master Commit: 53d36c0be43fdcff1422bf95c1113217c13a03c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=53d36c0be43fdcff1422bf9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 15:00:07 2018 +0200 testbot: Build the per-module test unit list from the list of Wine files. This also caches winefiles.txt so it is only reloaded when it changes. Also stop generating and retrieving testlist.txt since it is not needed anymore. If desired testlist.txt can be deleted for cleanup. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 10 ------ testbot/lib/WineTestBot/PatchUtils.pm | 62 +++++++++++++++++------------------ 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2950799..2e338c9 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -414,16 +414,6 @@ if ($NewStatus eq "completed") } } - Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); - if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) - { - copy "$TaskDir/testlist.txt", "$DataDir/latest/testlist.txt"; - } - elsif (!defined $TAError) - { - $TAError = "An error occurred while retrieving the test list: ". $TA->GetLastError(); - } - Debug(Elapsed($Start), " Retrieving the list of Wine files '$TaskDir/winefiles.txt'\n"); if ($TA->GetFile("latest/winefiles.txt", "$TaskDir/winefiles.txt")) { diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b6ea54b..725d53f 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -58,8 +58,8 @@ my $IgnoredPathsRe = join('|', =item C<UpdateWineData()> -Updates the summary information about the Wine source such as the list of -tests (testlist.txt) and the full list of Wine files. +Updates information about the Wine source, such as the list of Wine files, +for use by the TestBot server. =back =cut @@ -72,51 +72,51 @@ sub UpdateWineData($) my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt'`; return $ErrMessage if ($? != 0); - - if (open(my $fh, ">", "$DataDir/testlist.txt")) - { - foreach my $TestFile (glob("$WineDir/*/*/tests/*.c"), - glob("$WineDir/*/*/tests/*.spec")) - { - next if ($TestFile =~ m=/testlist\.c$=); - $TestFile =~ s=^$WineDir/==; - print $fh "$TestFile\n"; - } - close($fh); - return undef; - } - - return "Could not open 'testlist.txt' for writing: $!"; } +my $_TimeStamp; +my $_TestList; + =pod =over 12 -=item C<GetTestList()> +=item C<_LoadWineFiles()> -Returns a hashtable containing the list of the source files for a given module. -This structure is built from the latest/testlist.txt file. +Reads latest/winefiles.txt to build a per-module hashtable of the test unit +files. =back =cut -sub GetTestList() +sub _LoadWineFiles() { - my $TestList = {}; - if (open(my $File, "<", "$DataDir/latest/testlist.txt")) + my $FileName = "$DataDir/latest/winefiles.txt"; + my $MTime = (stat($FileName))[9] || 0; + + if ($_TestList and $_TimeStamp == $MTime) { - while (my $TestFileName = <$File>) + # The file has not changed since we loaded it + return; + } + + $_TimeStamp = $MTime; + $_TestList = {}; + if (open(my $fh, "<", $FileName)) + { + while (my $Line = <$fh>) { - chomp $TestFileName; - if ($TestFileName =~ m~^\w+/([^/]+)/tests/([^/]+)$~) + chomp $Line; + + if ($Line =~ m~^\w+/([^/]+)/tests/([^/]+)$~) { my ($Module, $File) = ($1, $2); - $TestList->{$Module}->{$File} = 1; + next if ($File eq "testlist.c"); + next if ($File !~ /\.(?:c|spec)$/); + $_TestList->{$Module}->{$File} = 1; } } - close($File); + close($fh); } - return $TestList; } sub _HandleFile($$$) @@ -154,8 +154,7 @@ sub _HandleFile($$$) if (!$Tests->{$Module}->{Files}) { - my $TestList = ( $Impacts->{TestList} ||= GetTestList() ); - foreach my $File (keys %{$TestList->{$Module}}) + foreach my $File (keys %{$_TestList->{$Module}}) { $Tests->{$Module}->{Files}->{$File} = 0; # not modified } @@ -192,6 +191,7 @@ sub GetPatchImpact($;$$) NoUnits => $NoUnits, Tests => {}, }; + _LoadWineFiles(); if ($PastImpacts) {

1 0

Zebediah Figura : winetest: Allow hyphens in test filenames.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: tools Branch: master Commit: 0d7e1f53e53163cdf6fed24eb177203a810a1cda URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d7e1f53e53163cdf6fed24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 24 11:54:14 2018 -0500 winetest: Allow hyphens in test filenames. For vulkan-1:vulkan. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 7416317..4db4f85 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -583,7 +583,7 @@ while ($line = <IN>) { next if ($line =~ /^\s*$/); chomp $line; $line =~ s/\r+$//; - if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9]+) (-|[.0-9a-f]+)\r?$%) + if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)\r?$%) { my ($l_dll, $l_unit, $l_type, $l_source, $l_rev) = ($1, $2, $3, $4, $5);

1 0

Alexandre Julliard : Wine release 3.11
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: website Branch: master Commit: 2f12f80a09fd5253521c45648c6c4873d7f4638c URL: https://source.winehq.org/git/website.git/?a=commit;h=2f12f80a09fd5253521c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 23 01:32:57 2018 +0200 Wine release 3.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018062301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018062301.xml b/news/en/2018062301.xml new file mode 100644 index 0000000..0eaff37 --- /dev/null +++ b/news/en/2018062301.xml @@ -0,0 +1,16 @@ +<news> +<date>June 23, 2018</date> +<title>Wine 3.11 Released</title> +<body> + The Wine development release 3.11 is now available. + <a href="{$root}/announce/3.11">What's new</a> in this release: +<ul> + <li>More debugger support for Wow64 processes.</li> + <li>Support for sha256/sha384 hashes in ECDSA signatures.</li> + <li>Better reporting of hyper-threaded CPUs.</li> + <li>Improvements to the standard Task Dialog.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.11.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.11 : Alexandre Julliard : Release 3.11
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: refs/tags/wine-3.11 Tag: f21bc6d8ea2ce5ad49d5a00bda567cfd462dcec7 URL: https://source.winehq.org/git/wine.git/?a=tag;h=f21bc6d8ea2ce5ad49d5a00bda5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 23 01:30:20 2018 +0200 Release 3.11

1 0

Alexandre Julliard : Release 3.11.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 58c49279f5d5ac11c0af25053f47845203dffdec URL: https://source.winehq.org/git/wine.git/?a=commit;h=58c49279f5d5ac11c0af2505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 23 01:30:20 2018 +0200 Release 3.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 611 +++++++++++++++++++++++++------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 251 insertions(+), 380 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58c49279f5d5ac11c0af…

1 0

Michael Stefaniuc : crypt32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 207e70cdc9e050c9ca4cc1c3c72d4250f80f85ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=207e70cdc9e050c9ca4cc1c3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 22 19:50:40 2018 +0200 crypt32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 10 ++-- dlls/crypt32/tests/cert.c | 2 +- dlls/crypt32/tests/encode.c | 108 +++++++++++++++++++++----------------------- dlls/crypt32/tests/main.c | 8 ++-- dlls/crypt32/tests/msg.c | 6 +-- dlls/crypt32/tests/oid.c | 6 +-- dlls/crypt32/tests/sip.c | 9 ++-- dlls/crypt32/tests/store.c | 6 +-- dlls/crypt32/tests/str.c | 17 +++---- 9 files changed, 80 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=207e70cdc9e050c9ca4c…

1 0

Michael Stefaniuc : crypt32: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: f7c2fe87f5ca322809052fd8b2bbdf53b02884ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c2fe87f5ca322809052fd8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 22 19:50:39 2018 +0200 crypt32: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index dd3fc33..6e8076c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -738,8 +738,7 @@ static BOOL url_matches(LPCWSTR constraint, LPCWSTR name, /* Ignore any path or query portion of the URL. */ if (*authority_end) { - if (authority_end - name < sizeof(hostname_buf) / - sizeof(hostname_buf[0])) + if (authority_end - name < ARRAY_SIZE(hostname_buf)) { memcpy(hostname_buf, name, (authority_end - name) * sizeof(WCHAR));

1 0

Michael Stefaniuc : kernel32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: cd1019fee815779dbc084e843b974cee09649c8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1019fee815779dbc084e84… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 22 19:50:38 2018 +0200 kernel32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 598 +++++++++++++++++++++---------------------- 1 file changed, 287 insertions(+), 311 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd1019fee815779dbc08…

1 0

Józef Kucia : shell32/tests: Remove empty element from known_folders[].
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: a8b0a822fff265a90659eef14059377a4c48f323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8b0a822fff265a90659eef1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 22 13:34:03 2018 +0200 shell32/tests: Remove empty element from known_folders[]. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index a578423..bac64e5 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1306,10 +1306,9 @@ static const struct knownFolderDef known_folders[] = { NULL, 0, 0), - { 0 } }; #undef KNOWN_FOLDER -BOOL known_folder_found[ARRAY_SIZE(known_folders)-1]; +BOOL known_folder_found[ARRAY_SIZE(known_folders)]; static void test_parameters(void) { @@ -1873,9 +1872,6 @@ if (0) { /* crashes */ { const KNOWNFOLDERID *folder_id = known_folders[i].folderId; - if (!folder_id) - continue; - path = NULL; hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT, NULL, &path); if (FAILED(hr)) @@ -1968,19 +1964,20 @@ static BOOL is_in_strarray(const WCHAR *needle, const char *hay) static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId) { HRESULT hr; - const struct knownFolderDef *known_folder = &known_folders[0]; int csidl, expectedCsidl, ret; KNOWNFOLDER_DEFINITION kfd; IKnownFolder *folder; WCHAR sName[1024]; - BOOL *current_known_folder_found = &known_folder_found[0]; BOOL found = FALSE; + unsigned int i; - while(known_folder->folderId != NULL) + for (i = 0; i < ARRAY_SIZE(known_folders); ++i) { + const struct knownFolderDef *known_folder = &known_folders[i]; + if(IsEqualGUID(known_folder->folderId, folderId)) { - *current_known_folder_found = TRUE; + known_folder_found[i] = TRUE; found = TRUE; /* verify CSIDL */ if(!(known_folder->csidl & NO_CSIDL)) @@ -2032,8 +2029,6 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId break; } - known_folder++; - current_known_folder_found++; } if(!found)

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2018