February 2013 - Wine-commits

Francois Gouget : testbot/build: Update the build VM configuration documentation.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 74bc129c0245b11c1e55c5eb91a358132fff00c9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=74bc129c0245b11c1e55c5eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 15:55:15 2013 +0100 testbot/build: Update the build VM configuration documentation. --- testbot/doc/INSTALL.txt | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index f57ed17..e8101ab 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -132,18 +132,20 @@ Dependencies: with MinGW. For instance on Debian you should install autoconf, bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to have 64bit VMs then make sure MinGW can generate 64bit PE executables. -- Create a new system group 'winehq' and a system user 'winehq', - make sure to make user winehq a member of group winehq. +- You may also want to install ccache. +- You will also need genisoimage. +- Create a new user, 'testbot' for instance, and log in as that user. - Clone Wine's tools repository to $HOME/tools (so this document should be available as $HOME/tools/testbot/doc/INSTALL.txt). -- Create the $HOME/tools/testbot/var directory and make it writable to - group winehq. + git clone git://source.winehq.org/git/tools.git +- Create the $HOME/tools/testbot/var directory and clone the Wine git + repository to wine-git: mkdir $HOME/tools/testbot/var - chmod g+w $HOME/tools/testbot/var -- Clone the Wine git repository to $HOME/tools/testbot/var/wine-git. -- In the winehq account, run Reconfig.pl. - Check $HOME/tools/testbot/log/Reconfig.log to make sure it - succeeded. + cd $HOME/tools/testbot/var + git clone git://source.winehq.org/git/wine.git wine-git +- Run $HOME/tools/testbot/bin/build/Reconfig.pl. +- Check $HOME/tools/testbot/var/Reconfig.log to make sure it succeeded. Fix + issues until it works. - Start the TestAgent server from the var directory: cd $HOME/tools/testbot/var && ../bin/build/testagentd PORT SRCHOST Where PORT is the $AgentPort that was configured in ConfigLocal.pl

1 0

Francois Gouget : testbot/build: Rename the wine-git directory to wine to simplify setup.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: a7ab9e840be914c71c7519c6df3c3c85c798949e URL: http://source.winehq.org/git/tools.git/?a=commit;h=a7ab9e840be914c71c7519c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 15:55:53 2013 +0100 testbot/build: Rename the wine-git directory to wine to simplify setup. --- testbot/bin/build/Build.pl | 8 ++++---- testbot/bin/build/Reconfig.pl | 6 +++--- testbot/doc/INSTALL.txt | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 8ecbd09..21899af 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -115,7 +115,7 @@ sub ApplyPatch } InfoMsg "Applying patch\n"; - system("( cd $DataDir/wine-git && set -x && " . + system("( cd $DataDir/wine && set -x && " . " git apply --verbose $PatchFile " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) @@ -127,7 +127,7 @@ sub ApplyPatch if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; - system("( cd $DataDir/wine-git && set -x && " . + system("( cd $DataDir/wine && set -x && " . " autoconf --output configure configure.ac " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) @@ -141,7 +141,7 @@ sub ApplyPatch if ($NeedImplib) { - if (open (FH, "<$DataDir/wine-git/$PatchType/$BaseName/Makefile.in")) + if (open (FH, "<$DataDir/wine/$PatchType/$BaseName/Makefile.in")) { $NeedImplib = !1; my $Line; @@ -179,7 +179,7 @@ sub BuildTestExecutable InfoMsg "Reconfigure $Bits-bit crossbuild\n"; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . + " ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index cc8e76e..a82d879 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -60,7 +60,7 @@ sub FatalError sub GitPull { - system("cd $DataDir/wine-git && git pull >> $LogDir/Reconfig.log 2>&1"); + system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { LogMsg "Git pull failed\n"; @@ -115,7 +115,7 @@ sub BuildNative mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . - " time ../wine-git/configure --enable-win64 --without-x --without-freetype && " . + " time ../wine/configure --enable-win64 --without-x --without-freetype && " . " time make -j$ncpus depend && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -137,7 +137,7 @@ sub BuildCross mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . - " time ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . " time make -j$ncpus depend && " . " time make -j$ncpus programs/winetest " . ") >>$LogDir/Reconfig.log 2>&1"); diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index e8101ab..c8597d2 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -139,10 +139,10 @@ Dependencies: should be available as $HOME/tools/testbot/doc/INSTALL.txt). git clone git://source.winehq.org/git/tools.git - Create the $HOME/tools/testbot/var directory and clone the Wine git - repository to wine-git: + repository to wine: mkdir $HOME/tools/testbot/var cd $HOME/tools/testbot/var - git clone git://source.winehq.org/git/wine.git wine-git + git clone git://source.winehq.org/git/wine.git wine - Run $HOME/tools/testbot/bin/build/Reconfig.pl. - Check $HOME/tools/testbot/var/Reconfig.log to make sure it succeeded. Fix issues until it works.

1 0

Francois Gouget : testbot/TestAgent: Fix GetFile()'s error handling.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 00c73ead8962dc69ec1e02a69633c70362c5dfef URL: http://source.winehq.org/git/tools.git/?a=commit;h=00c73ead8962dc69ec1e02a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:53:03 2013 +0100 testbot/TestAgent: Fix GetFile()'s error handling. --- testbot/lib/WineTestBot/TestAgent.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f06bd71..7852e41 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -287,7 +287,7 @@ sub _RecvEntryHeader($) return ($Type, $High << 32 | $Low); } -sub _ExpectEntryHeader($$$) +sub _ExpectEntryHeader($$;$) { my ($self, $Type, $Size) = @_; @@ -368,7 +368,7 @@ sub _RecvFile($$$) return undef if (!defined $self->{fd}); debug(" RecvFile($Filename)\n"); - my $Size = $self->_RecvEntryHeader('d'); + my $Size = $self->_ExpectEntryHeader('d'); return undef if (!defined $Size); my $Success; @@ -988,6 +988,7 @@ sub GetFile($$$) { my $Success = $self->_GetFileOrString($ServerPathName, $LocalPathName, $fh); close($fh); + unlink $LocalPathName if (!$Success); return $Success; } $self->_SetError($ERROR, "Unable to open '$LocalPathName' for writing: $!");

1 0

Francois Gouget : testbot/testagentd: Print the version on startup.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: cbf8daaa998399093b0ca517385caf18784d91f2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cbf8daaa998399093b0ca517… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:57:42 2013 +0100 testbot/testagentd: Print the version on startup. --- testbot/src/testagentd/testagentd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 3de9a3c..837ff02 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1139,6 +1139,7 @@ int main(int argc, char** argv) error("listen() failed: %s\n", sockerror()); exit(1); } + printf("Starting %s\n", PROTOCOL_VERSION); while (1) { SOCKET client;

1 0

Francois Gouget : testbot/TestAgent: Use the basename of the first filename if the second one is omitted for getfile or sendfile .
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 82048e24fad06f016a182544829a02a2d5138fe1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=82048e24fad06f016a182544… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:59:25 2013 +0100 testbot/TestAgent: Use the basename of the first filename if the second one is omitted for getfile or sendfile. --- testbot/scripts/TestAgent | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 8605002..02da611 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -128,13 +128,35 @@ while (@ARGV) { $Cmd = $arg; $LocalFilename = check_opt_val($arg, $LocalFilename); - $ServerFilename = check_opt_val($arg, $ServerFilename) if (!$Usage); + if (!$Usage) + { + if (@ARGV) + { + $ServerFilename = check_opt_val($arg, $ServerFilename); + } + else + { + $ServerFilename = $LocalFilename; + $ServerFilename =~ s%^.*/%%; + } + } } elsif ($arg eq "getfile") { $Cmd = $arg; $ServerFilename = check_opt_val($arg, $ServerFilename); - $LocalFilename = check_opt_val($arg, $LocalFilename) if (!$Usage); + if (!$Usage) + { + if (@ARGV) + { + $LocalFilename = check_opt_val($arg, $LocalFilename); + } + else + { + $LocalFilename = $ServerFilename; + $LocalFilename =~ s%^.*[/\\]%%; + } + } } elsif ($arg eq "run") {

1 0

Francois Gouget : testbot/testagentd: Catch SIGPIPE so the server does not die if the client disconnects during a file transfer .
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: da4926a61e72a4a91e1941a53872828a9d725ea7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da4926a61e72a4a91e1941a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:59:57 2013 +0100 testbot/testagentd: Catch SIGPIPE so the server does not die if the client disconnects during a file transfer. --- testbot/src/testagentd/platform_unix.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index d7d8f54..cd08c58 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -228,6 +228,8 @@ void ta_freeaddrinfo(struct addrinfo *addresses) int platform_init(void) { struct sigaction sa, osa; + + /* Catch SIGCHLD so we can keep track of child processes */ sa.sa_handler = reaper; sigemptyset(&sa.sa_mask); sa.sa_flags = SA_RESTART; @@ -236,5 +238,18 @@ int platform_init(void) error("could not set up the SIGCHLD handler: %s\n", strerror(errno)); return 0; } + + /* Catch SIGPIPE so we don't die if the client disconnects at an + * inconvenient time + */ + sa.sa_handler = SIG_IGN; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART; + if (sigaction(SIGPIPE, &sa, &osa) < 0) + { + error("could not set up the SIGPIPE handler: %s\n", strerror(errno)); + return 0; + } + return 1; }

1 0

Francois Gouget : testbot/TestAgent: Fix handling of --run-no-wait.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 7e6a6a5bcef1d8006817a9c8635a6cb7d0ee0525 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7e6a6a5bcef1d8006817a9c8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:00:18 2013 +0100 testbot/TestAgent: Fix handling of --run-no-wait. --- testbot/scripts/TestAgent | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 02da611..78d9c24 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -299,6 +299,7 @@ elsif ($Cmd eq "run") my $Pid = $TA->Run(\@Run, $RunFlags, $RunIn, $RunOut, $RunErr); if ($Pid) { + $Result = 1; print "Started process $Pid\n"; if (!($RunFlags & $TestAgent::RUN_DNT)) {

1 0

Francois Gouget : testbot/TestAgent: Don' t try to parse $TunnelOpt as an SSH URI if it is set to 'never'.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: da1496d337c3970e5cbc26db41d6247e48a2af35 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da1496d337c3970e5cbc26db… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:03:11 2013 +0100 testbot/TestAgent: Don't try to parse $TunnelOpt as an SSH URI if it is set to 'never'. --- testbot/scripts/TestAgent | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 78d9c24..d25a3d6 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -271,7 +271,7 @@ if (defined $Usage) $TunnelOpt = $Tunnel if (!defined $TunnelOpt); my $TunnelInfo; -if ($TunnelOpt) +if ($TunnelOpt and $TunnelOpt =~ /^ssh:/) { my $ParsedURI = URI->new($TunnelOpt); %$TunnelInfo = %$TunnelDefaults if ($TunnelDefaults);

1 0

Francois Gouget : testbot/TestAgent: 'nc -q0' seems to be the default but make it explicit just in case.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 3fff4c25a586c150969ea181519228e5855dec07 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3fff4c25a586c150969ea181… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:32:11 2013 +0100 testbot/TestAgent: 'nc -q0' seems to be the default but make it explicit just in case. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 7852e41..4fe1b25 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -851,7 +851,7 @@ sub _Connect($) # Use netcat to forward the connection from the SSH server to the TestAgent # server. Note that we won't know about netcat errors at this point. - if (!$self->{fd}->exec("nc '$self->{agenthost}' '$self->{agentport}'")) + if (!$self->{fd}->exec("nc -q0 '$self->{agenthost}' '$self->{agentport}'")) { $self->_SetError($FATAL, "Unable to start netcat: " . $self->_ssherror()); return undef;

1 0

Francois Gouget : testbot/TestAgent: Retrieve the netcat error when the connection breaks.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: bb7361dccc5918ae71e1ef341c7c00eaa6fb1d48 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bb7361dccc5918ae71e1ef34… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:32:50 2013 +0100 testbot/TestAgent: Retrieve the netcat error when the connection breaks. It may provide important clues as to what went wrong, especially when trying to connect. --- testbot/lib/WineTestBot/TestAgent.pm | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 4fe1b25..cda83a8 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -88,6 +88,7 @@ sub Disconnect($) # which will avoid undue delays. $self->{ssh}->disconnect(); $self->{ssh} = undef; + $self->{nc} = undef; } if ($self->{sshfd}) { @@ -148,7 +149,29 @@ sub _SetError($$$) $self->{err} = $Msg; # And disconnect on fatal errors since the connection is unusable anyway - $self->Disconnect() if ($Level == $FATAL); + if ($Level == $FATAL) + { + if ($self->{ssh}) + { + # Try to capture the netcat exit code and error message as + # they may provide important clues as to what went wrong + my $rc = $self->{fd}->exit_status(); + if ($rc) + { + my $ncerr; + eval + { + alarm(2); + $self->{fd}->read($ncerr, 1024, 1); + alarm(0); + }; + $ncerr = $rc if (!$ncerr); + $ncerr = "the \"$self->{nc}\" command returned $ncerr"; + $self->{err} = $self->{agentversion} ? "$self->{err}\n$ncerr" : $ncerr; + } + } + $self->Disconnect(); + } } elsif (!$self->{err}) { @@ -851,7 +874,9 @@ sub _Connect($) # Use netcat to forward the connection from the SSH server to the TestAgent # server. Note that we won't know about netcat errors at this point. - if (!$self->{fd}->exec("nc -q0 '$self->{agenthost}' '$self->{agentport}'")) + $self->{nc} = "nc -q0 '$self->{agenthost}' '$self->{agentport}'"; + debug("Tunneling command: $self->{nc}\n"); + if (!$self->{fd}->exec($self->{nc})) { $self->_SetError($FATAL, "Unable to start netcat: " . $self->_ssherror()); return undef; @@ -864,7 +889,7 @@ sub _Connect($) if (!defined $self->{agentversion}) { # We have already been disconnected at this point - $self->{err} = "Unable to get the protocol version spoken by the server: $self->{err}"; + debug("could not get the protocol version spoken by the server\n"); return undef; }

1 0