February 2013 - Wine-Commits

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

Feb. 25, 2013

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

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

Feb. 25, 2013

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 GetFile()'s error handling.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

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/build: Rename the wine-git directory to wine to simplify setup.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

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: Don' t try to parse $TunnelOpt as an SSH URI if it is set to 'never'.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

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: Use the basename of the first filename if the second one is omitted for getfile or sendfile .
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

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/build: Update the build VM configuration documentation.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

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/TestAgent: 'nc -q0' seems to be the default but make it explicit just in case.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

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: Extend and fix the run RPC' s redirection options.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 3fca08b59407b3e7c215e5d9298ccd267cce3831 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3fca08b59407b3e7c215e5d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:40:42 2013 +0100 testbot/TestAgent: Extend and fix the run RPC's redirection options. Always set up the stdout and stderr redirections for append so they don't overwrite each other. Add options to prevent the truncation of the files stdout and stderr are redirected to. This makes it possible to run multiple commands in a row and to collect all their output in a single file. --- testbot/lib/WineTestBot/TestAgent.pm | 5 ++++- testbot/scripts/TestAgent | 10 ++++++++++ testbot/src/testagentd/platform.h | 2 ++ testbot/src/testagentd/platform_unix.c | 16 ++++++++++++++-- testbot/src/testagentd/platform_windows.c | 19 ++++++++++++++++++- testbot/src/testagentd/testagentd.c | 11 ++++++----- 6 files changed, 54 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index c3326d6..074e4f0 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -21,7 +21,7 @@ package TestAgent; use strict; -use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT); +use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT $RUN_DNTRUNC_OUT $RUN_DNTRUNC_ERR $RUN_DNTRUNC); require Exporter; @ISA = qw(Exporter); @@ -1031,6 +1031,9 @@ sub GetFileToString($$) } $RUN_DNT = 1; +$RUN_DNTRUNC_OUT = 2; +$RUN_DNTRUNC_ERR = 4; +$RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; sub Run($$$;$$$) { diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 1424998..521e741 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -120,6 +120,14 @@ while (@ARGV) { $RunErr = check_opt_val($arg, $RunErr); } + elsif ($arg eq "--run-dntrunc-out") + { + $RunFlags |= $TestAgent::RUN_DNTRUNC_OUT; + } + elsif ($arg eq "--run-dntrunc-err") + { + $RunFlags |= $TestAgent::RUN_DNTRUNC_ERR; + } elsif (!defined $Hostname) { $Hostname = $arg; @@ -252,8 +260,10 @@ if (defined $Usage) print " specified server file.\n"; print " --run-out <serverpath> Redirect the stdout or the command being run to the\n"; print " specified server file.\n"; + print " --run-dntrunc-out Do not truncate the file stdout is redirected to.\n"; print " --run-err <serverpath> Redirect the stderr or the command being run to the\n"; print " specified server file.\n"; + print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the version of the server.\n"; print " ping Makes sure the server is still alive.\n"; diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index d2a3934..621ce98 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -60,6 +60,8 @@ int platform_init(void); enum run_flags_t { RUN_DNT = 1, + RUN_DNTRUNC_OUT = 2, + RUN_DNTRUNC_ERR = 4, }; /* Starts the specified command in the background and reports the status to diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 6552e05..48eef73 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -69,13 +69,25 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) { pid_t pid; int fds[3] = {-1, -1, -1}; - int i; + int ofl, i; for (i = 0; i < 3; i++) { if (redirects[i][0] == '\0') continue; - fds[i] = open(redirects[i], (i ? O_WRONLY : O_RDONLY) | O_CREAT | O_TRUNC); + switch (i) + { + case 0: + ofl = O_RDONLY; + break; + case 1: + ofl = O_APPEND | O_CREAT | (flags & RUN_DNTRUNC_OUT ? 0 : O_TRUNC); + break; + case 2: + ofl = O_APPEND | O_CREAT | (flags & RUN_DNTRUNC_ERR ? 0 : O_TRUNC); + break; + } + fds[i] = open(redirects[i], ofl, 0666); if (fds[i] < 0) { set_status(ST_ERROR, "unable to open '%s' for %s: %s", redirects[i], i ? "writing" : "reading", strerror(errno)); diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 9e5bf78..10ea55a 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -82,13 +82,30 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) has_redirects = 0; for (i = 0; i < 3; i++) { + DWORD access, creation; if (redirects[i][0] == '\0') { fhs[i] = GetStdHandle(stdhandles[i]); continue; } has_redirects = 1; - fhs[i] = CreateFile(redirects[i], (i ? GENERIC_WRITE : GENERIC_READ), FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + switch (i) + { + case 0: + access = GENERIC_READ; + creation = OPEN_EXISTING; + break; + case 1: + access = FILE_APPEND_DATA; + creation = (flags & RUN_DNTRUNC_OUT ? OPEN_ALWAYS : CREATE_ALWAYS); + break; + case 2: + access = FILE_APPEND_DATA; + creation = (flags & RUN_DNTRUNC_ERR ? OPEN_ALWAYS : CREATE_ALWAYS); + break; + } + fhs[i] = CreateFile(redirects[i], access, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, creation, FILE_ATTRIBUTE_NORMAL, NULL); + debug(" %d redirected -> %p\n", i, fhs[i]); if (fhs[i] == INVALID_HANDLE_VALUE) { set_status(ST_ERROR, "unable to open '%s' for %s: %lu", redirects[i], i ? "writing" : "reading", GetLastError()); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 8a8f2bb..c06af72 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -33,8 +33,9 @@ * Otherwise increase the minor version number: * 1.0: Initial release. * 1.1: Added the wait2 RPC. + * 1.2: Add more redirection options to the run RPC. */ -#define PROTOCOL_VERSION "testagentd 1.1" +#define PROTOCOL_VERSION "testagentd 1.2" #define BLOCK_SIZE 4096 @@ -730,10 +731,10 @@ static void do_run(SOCKET client) debug(" run '%s", argv[0]); for (i = 1; i < argc; i++) debug("' '%s", argv[i]); - debug("' %s%s%s%s%s%s\n", - redirects[0][0] ? " <" : "", redirects[0], - redirects[1][0] ? " >" : "", redirects[1], - redirects[2][0] ? " 2>" : "", redirects[2]); + debug("'%s%s%s%s%s%s\n", + !redirects[0][0] ? "" : " <", redirects[0], + !redirects[1][0] ? "" : (flags & RUN_DNTRUNC_OUT) ? " >>" : " >", redirects[1], + !redirects[2][0] ? "" : (flags & RUN_DNTRUNC_ERR) ? " 2>>" : " 2>", redirects[2]); pid = platform_run(argv, flags, redirects); if (!pid)

1 0

Francois Gouget : testbot/testagentd: Allow reading, writing and deleting the run command redirect files.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 2b6cf2889054a8fdf5117795480d515ae8915330 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2b6cf2889054a8fdf5117795… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:35:16 2013 +0100 testbot/testagentd: Allow reading, writing and deleting the run command redirect files. In particular if we send stdout or stderr to a log, it's important that we can read it even if the command gets stuck. --- testbot/src/testagentd/platform_windows.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 55ed51d..9e5bf78 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -88,7 +88,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) continue; } has_redirects = 1; - fhs[i] = CreateFile(redirects[i], (i ? GENERIC_WRITE : GENERIC_READ), 0, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + fhs[i] = CreateFile(redirects[i], (i ? GENERIC_WRITE : GENERIC_READ), FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (fhs[i] == INVALID_HANDLE_VALUE) { set_status(ST_ERROR, "unable to open '%s' for %s: %lu", redirects[i], i ? "writing" : "reading", GetLastError());

1 0