August 2012 - Wine-commits - list.winehq.org

Francois Gouget : testbot: Add LICENSE and COPYING.LIB files.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: tools Branch: master Commit: bc02d247da299a688079e14ce4cc5a9ec3a5ea0b URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc02d247da299a688079e14c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 29 16:35:53 2012 +0200 testbot: Add LICENSE and COPYING.LIB files. --- testbot/COPYING.LIB | 502 +++++++++++++++++++++++++++++++++++++++++++++++++++ testbot/LICENSE | 17 ++ 2 files changed, 519 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=bc02d247da299a688079…

1 0

Francois Gouget : testbot: Add a README file.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: tools Branch: master Commit: 0b5285bc6f5365e0eda31d120c501c716ee9dbaf URL: http://source.winehq.org/git/tools.git/?a=commit;h=0b5285bc6f5365e0eda31d12… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 29 16:36:55 2012 +0200 testbot: Add a README file. --- testbot/README | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/testbot/README b/testbot/README new file mode 100644 index 0000000..4f4cbc9 --- /dev/null +++ b/testbot/README @@ -0,0 +1,70 @@ +1. PURPOSE +---------- + +The goal of the WineTestBot is to make sure that only valid conformance +tests enter the Wine codebase. + +The goal of Wine's conformance tests is to describe the behavior of the +Windows APIs, ignoring bugs and quirks specific to one Windows version. +They are then used to make sure Wine's behavior is correct. But the +correctness of the tests themselves can only be verified by running +them on multiple Windows versions which is out of the reach of most Wine +developers. This is the issue that the WineTestBot intends to fix. + + +2. MEANS +-------- + +The WineTestBot provides ways to run the conformance tests on a set of +Windows machines. There are three ways this can happen: + +* Registered users can submit patches and binaries using the web site + and have them run on the set of Windows machines of their choosing. + +* Conformance test patches sent to the wine-patches mailing list are + run on the default set of Windows machines. Any failure is reported + to the patch author and to the wine-devel mailing list. + +* The WineTestBot also runs the full conformance test suite whenever + there is a round of Wine commits. + + +3. GENERAL ARCHITECTURE +----------------------- + +Most of the work is done on virtual machines for two reasons: + +* By its very nature the WineTestBot runs untrusted code. Virtual + machines provide a way to isolate the effect of malicious code and + can safely be reset to a clean state from the outside. + +* It's easy to reset the VMs to a clean state between each test, thus + ensuring they all run in a pristine environment. + +This results in four types of machines being involved in the +WineTestBot: + +* The WineTestBot server + It hosts the website, WineTestBot server processes, and, usually, + also the WineTestBot database. This is the machine that orchestrates + everything. + +* VM hosts + These host the Linux Build VM and the Windows Test VMs. The + WineTestBot server tells them which VMs to power on or revert to a + clean state at a given time. + +* Linux Build VM + This is the virtual machine that is used to compile the patches and + generate the Windows binaries to test. It receives its commands + directly from the WineTestBot server. + +* Windows Test VMs + These are the Windows machines the tests run on. They receive the test + binaries directly from the WineTestBot server. + + +4. INSTALLATION +--------------- + +See the doc/INSTALL.txt file.

1 0

Francois Gouget : testbot/Engine: On startup stop stale RevertVM. pl processes and consider the VMs dirty.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: tools Branch: master Commit: b967042dfc94fef6c4853a6fdea9c163d4e48843 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b967042dfc94fef6c4853a6f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 29 16:39:49 2012 +0200 testbot/Engine: On startup stop stale RevertVM.pl processes and consider the VMs dirty. On startup we don't know what state the VMs are in: they may be shut off following a VM host reboot or they may still be running old tasks. So consider them all to be dirty (i.e. in need of a revert before use). --- testbot/bin/Engine.pl | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a4db2e1..f63344b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -541,6 +541,25 @@ sub ClientRead return $GotSomething; } +sub InitVMs() +{ + # Kill any stale RevertVM.pl process so they don't mess with our VMs + system('killall RevertVM.pl 2>/dev/null'); + + # On startup we don't know what state the VMs are in. So consider them all + # to be dirty. + my $VMs = CreateVMs(); + foreach my $VMKey (@{$VMs->GetKeys()}) + { + my $VM = $VMs->GetItem($VMKey); + if ($VM->Status ne "offline") + { + $VM->Status("dirty"); + $VM->Save(); + } + } +} + sub SafetyNet { my $Jobs = CreateJobs(); @@ -635,6 +654,8 @@ sub main $WineTestBot::Engine::Notify::RunningInEngine = 1; + InitVMs(); + my $SockName = "$DataDir/socket/engine"; my $uaddr = sockaddr_un($SockName); my $proto = getprotobyname('tcp');

1 0

Francois Gouget : testbot/bin: CVS is not used anymore so remove WineCvsHandler.pl.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: tools Branch: master Commit: acf379aad4658d98ce3e189c587d84634ba9c471 URL: http://source.winehq.org/git/tools.git/?a=commit;h=acf379aad4658d98ce3e189c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 29 16:44:26 2012 +0200 testbot/bin: CVS is not used anymore so remove WineCvsHandler.pl. --- testbot/bin/WineCvsHandler.pl | 35 ----------------------------------- 1 files changed, 0 insertions(+), 35 deletions(-) diff --git a/testbot/bin/WineCvsHandler.pl b/testbot/bin/WineCvsHandler.pl deleted file mode 100755 index 02f807a..0000000 --- a/testbot/bin/WineCvsHandler.pl +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/perl -Tw -# -# Tell the engine to expect a winetest.exe update on test.winehq.org -# -# Copyright 2009 Ge van Geldorp -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -use strict; - -my $Dir; -sub BEGIN -{ - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; -} -use lib "$Dir/../lib"; - -use WineTestBot::Engine::Notify; - -ExpectWinetestUpdate(); - -exit 0;

1 0

Francois Gouget : testbot/scripts: We don' t use SVN anymore so remove the update.sh script.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: tools Branch: master Commit: bcc3936bd1cdc760150f00007d900e3cc6c8328e URL: http://source.winehq.org/git/tools.git/?a=commit;h=bcc3936bd1cdc760150f0000… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 29 16:55:31 2012 +0200 testbot/scripts: We don't use SVN anymore so remove the update.sh script. --- testbot/scripts/update.sh | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/testbot/scripts/update.sh b/testbot/scripts/update.sh deleted file mode 100755 index e274266..0000000 --- a/testbot/scripts/update.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -umask 002 - -rm -rf ../winetestbot.new/* -svn export --force file:///srv/svn/repos_winetestbot/trunk ../winetestbot.new -rm -rf ../winetestbot.old/* -mv ../winetestbot/* ../winetestbot.old -mv ../winetestbot.new/* ../winetestbot -cp -p ../winetestbot.old/lib/WineTestBot/ConfigLocal.pl ../winetestbot/lib/WineTestBot

1 0

Francois Gouget : testbot/bin: Fix some log and error messages.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: tools Branch: master Commit: 1b803b237bbc843167864f66b124681e526ab04d URL: http://source.winehq.org/git/tools.git/?a=commit;h=1b803b237bbc843167864f66… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 29 18:34:33 2012 +0200 testbot/bin: Fix some log and error messages. Always mention the name of the script issuing the log messages. --- testbot/bin/Engine.pl | 2 +- testbot/bin/RetrievePatches.pl | 6 +++--- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineSendLog.pl | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f63344b..9b57ae6 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -463,7 +463,7 @@ sub HandleGetScreenshot return "0$ErrMessage"; } - return "1" . $ImageBytes;; + return "1" . $ImageBytes; } sub HandleClientCmd diff --git a/testbot/bin/RetrievePatches.pl b/testbot/bin/RetrievePatches.pl index 132b9f4..c0f17c8 100755 --- a/testbot/bin/RetrievePatches.pl +++ b/testbot/bin/RetrievePatches.pl @@ -47,7 +47,7 @@ if ($StartPatchId =~ m/^(\d+)$/) } else { - die "Invalid StartPatchId $StartPatchId"; + die "RetrievePatches: Invalid StartPatchId $StartPatchId"; } if ($EndPatchId =~ m/^(\d+)$/) { @@ -55,11 +55,11 @@ if ($EndPatchId =~ m/^(\d+)$/) } else { - die "Invalid EndPatchId $EndPatchId"; + die "RetrievePatches: Invalid EndPatchId $EndPatchId"; } if ($EndPatchId < $StartPatchId) { - die "EndPatchId $EndPatchId shouldn't be smaller than StartPatchId $StartPatchId"; + die "RetrievePatches: EndPatchId $EndPatchId shouldn't be smaller than StartPatchId $StartPatchId"; } my $BaseURL = "http://source.winehq.org/patches/data"; diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index eff4709..d11d4bf 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -234,7 +234,7 @@ $ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", "$DataDir/staging/$FileName"); if (defined($ErrMessage)) { - FatalError "Can't copy exe to VM: $ErrMessage\n", + FatalError "Can't copy patch to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } my $Script = "#!/bin/sh\n"; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 34d8378..1f92083 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -40,7 +40,7 @@ sub FatalError my $JobKey = defined($Job) ? $Job->GetKey() : "0"; - LogMsg "SendLog: $JobKey $ErrMessage"; + LogMsg "WineSendLog: $JobKey $ErrMessage"; exit 1; } @@ -124,7 +124,7 @@ sub ReadLog } else { - LogMsg "SendLog: Unable to open log $LogName\n"; + LogMsg "WineSendLog: Unable to open log $LogName\n"; } return \@Messages; @@ -400,7 +400,7 @@ EOF } else { - LogMsg "SendLog: BotFailure found in ${LatestName}.err\n"; + LogMsg "WineSendLog: BotFailure found in ${LatestName}.err\n"; } if ($MessagesFromErr || $MessagesFromLog) { @@ -410,7 +410,7 @@ EOF } elsif ($BotFailure) { - LogMsg "SendLog: BotFailure found in $TaskDir/err\n"; + LogMsg "WineSendLog: BotFailure found in $TaskDir/err\n"; } } @@ -509,7 +509,7 @@ delete $ENV{ENV}; my $JobId = $ARGV[0]; if (! $JobId) { - die "Usage: SendLog.pl JobId"; + die "Usage: WineSendLog.pl JobId"; } # Untaint parameters @@ -531,6 +531,6 @@ if (! defined($Job)) SendLog($Job); -LogMsg "SendLog: log for job $JobId sent\n"; +LogMsg "WineSendLog: log for job $JobId sent\n"; exit;

1 0

Francois Gouget : testbot/VMs: ListDirectoryInGuest() is not used so remove it.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: tools Branch: master Commit: b4a886d6d9c010ed76b5076c14cfa9412e6a8c6b URL: http://source.winehq.org/git/tools.git/?a=commit;h=b4a886d6d9c010ed76b5076c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 29 18:34:46 2012 +0200 testbot/VMs: ListDirectoryInGuest() is not used so remove it. --- testbot/lib/WineTestBot/VMs.pm | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 58f0dbc..fac32b5 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -469,28 +469,6 @@ sub CaptureScreenImage return (undef, $ImageSize, $ImageBytes); } -sub ListDirectoryInGuest -{ - my $self = shift; - my $PathName = $_[0]; - - my ($ErrMessage, $VMHandle) = $self->GetVMHandle(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } - - $ErrMessage = $self->LoginInGuest($VMHandle, !1); - if (defined($ErrMessage)) - { - return $ErrMessage; - } - - my ($Err, @DirectoryContents) = VMListDirectoryInGuest($VMHandle, $PathName, - 0); - return ($self->CheckError($Err), @DirectoryContents); -} - sub Status { my $self = shift;

1 0

Francois Gouget : testbot/bin: HandleBuildNotification() is unused so remove it.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: tools Branch: master Commit: 72a703d76a4e1d06cdb3f613868ae0fc4dac0437 URL: http://source.winehq.org/git/tools.git/?a=commit;h=72a703d76a4e1d06cdb3f613… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 29 18:34:58 2012 +0200 testbot/bin: HandleBuildNotification() is unused so remove it. It also depends on the missing XxxRetrieveBuild.pl script anyway. --- testbot/bin/Engine.pl | 32 ------------------------------ testbot/lib/WineTestBot/Engine/Notify.pm | 19 +---------------- 2 files changed, 1 insertions(+), 50 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 9b57ae6..488c8eb 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -410,34 +410,6 @@ sub HandlePatchRetrieved return defined($ErrMessage) ? "0" . $ErrMessage : "1OK"; } -sub HandleBuildNotification -{ - # Validate build number - if ($_[0] !~ m/^(\d+)$/) - { - return "0Invalid build number"; - } - my $BuildNo = $1; - - $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); - my $Pid = fork; - if (defined($Pid) && ! $Pid) - { - exec("$BinDir/${ProjectName}RetrieveBuild.pl $BuildNo"); - } - if (defined($Pid) && ! $Pid) - { - LogMsg "Engine: Unable to exec ${ProjectName}BuildHandler.pl : $!\n"; - exit; - } - if (! defined($Pid)) - { - LogMsg "Engine: Unable to fork for ${ProjectName}BuildHandler.pl : $!\n"; - } - - return "1OK"; -} - sub HandleGetScreenshot { # Validate VM name @@ -513,10 +485,6 @@ sub HandleClientCmd { return HandlePatchRetrieved(@_); } - if ($Cmd eq "buildnotification") - { - return HandleBuildNotification(@_); - } if ($Cmd eq "getscreenshot") { return HandleGetScreenshot(@_); diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 46cd9cc..e461bb8 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -36,7 +36,7 @@ require Exporter; @EXPORT = qw(&PingEngine &JobSubmit &JobStatusChange &JobCancel &TaskComplete &VMStatusChange &ExpectWinetestUpdate &FoundWinetestUpdate &NewWinePatchesSubmission &PatchNotification &PatchRetrieved - &BuildNotification &GetScreenshot); + &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -249,23 +249,6 @@ sub PatchRetrieved return substr($Reply, 1); } -sub BuildNotification -{ - my $BuildNo = $_[0]; - - my $Reply = SendCmdReceiveReply("buildnotification $BuildNo\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub GetScreenshot { my $VMName = $_[0];

1 0

Francois Gouget : testbot/doc: Update the installation instructions.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: tools Branch: master Commit: a6ca5c5be5d1c51353e7718697a570c3218fb76a URL: http://source.winehq.org/git/tools.git/?a=commit;h=a6ca5c5be5d1c51353e77186… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 29 19:03:37 2012 +0200 testbot/doc: Update the installation instructions. --- testbot/ddl/winetestbot.sql | 10 ++ testbot/doc/INSTALL.txt | 199 ++++++++++++++++++++++++++++++++----------- 2 files changed, 159 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=a6ca5c5be5d1c51353e7…

1 0

Rico Schüller : d3dx9: Handle D3DXPC_VECTOR in set_matrix_array().
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: b5b052072383cd98a950631f4b9f1f3855b80776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b052072383cd98a950631f4… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 13:43:04 2012 +0200 d3dx9: Handle D3DXPC_VECTOR in set_matrix_array(). --- dlls/d3dx9_36/shader.c | 5 ++++- dlls/d3dx9_36/tests/shader.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 832ba40..fa72cfc 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1177,6 +1177,7 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev if (desc->Class == D3DXPC_MATRIX_ROWS || desc->Class == D3DXPC_MATRIX_COLUMNS + || desc->Class == D3DXPC_VECTOR || desc->Class == D3DXPC_SCALAR) { if (desc->Class == class) row_offset = 4; @@ -1184,6 +1185,8 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev if (class == D3DXPC_MATRIX_ROWS) { + if (desc->Class == D3DXPC_VECTOR) return D3D_OK; + num_rows = min(desc->Rows, rows); num_columns = min(desc->Columns, columns); } @@ -1198,7 +1201,7 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev else { FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class)); - return D3D_OK; + return E_NOTIMPL; } switch (desc->RegisterSet) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index cd69a34..2792327 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -707,7 +707,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable f4: 0x%08x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); - todo_wine ok(out[0] == S(U(mvp))._11 && out[1] == S(U(mvp))._21 && out[2] == S(U(mvp))._31 && out[3] == S(U(mvp))._41, + ok(out[0] == S(U(mvp))._11 && out[1] == S(U(mvp))._21 && out[2] == S(U(mvp))._31 && out[3] == S(U(mvp))._41, "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixTranspose, " "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[1], out[2], out[3],

1 0