wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Francois Gouget : testbot/TestAgent: Extend and fix the run RPC' s redirection options.
by Alexandre Julliard 25 Feb '13

25 Feb '13

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 25 Feb '13

25 Feb '13

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

Francois Gouget : testbot/TestAgent: Use the new wait() RPC with the timeout parameter if available.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 66b8798d53fb28266290a6b731a8f2007b220326 URL: http://source.winehq.org/git/tools.git/?a=commit;h=66b8798d53fb28266290a6b7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 20:29:26 2013 +0100 testbot/TestAgent: Use the new wait() RPC with the timeout parameter if available. This lets us distinguish cases where the child process runs for too long from network issues. Note that when connected to an old testagentd server the old RPC will be used to preserve compatibility. --- testbot/bin/WineRunBuild.pl | 4 +-- testbot/bin/WineRunReconfig.pl | 4 +-- testbot/bin/WineRunTask.pl | 4 +-- testbot/lib/WineTestBot/TestAgent.pm | 35 ++++++++++++++++++++++++++------- testbot/scripts/TestAgent | 2 +- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index d335214..20a43da 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -256,12 +256,10 @@ if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) $FullErrFileName, $Job, $Step, $Task; } my $Pid = $TA->Run(["./task"], 0); -my $OldTimeout = $TA->SetTimeout($Task->Timeout); -if (!$Pid or !defined $TA->Wait($Pid)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); } -$TA->SetTimeout($OldTimeout); if (defined($ErrMessage)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0618a48..18d8c69 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -209,12 +209,10 @@ if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) $FullErrFileName, $Job, $Step, $Task; } my $Pid = $TA->Run(["./task"], 0); -my $OldTimeout = $TA->SetTimeout($Task->Timeout); -if (!$Pid or !defined $TA->Wait($Pid)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); } -$TA->SetTimeout($OldTimeout); if (defined($ErrMessage)) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 9751d3b..73d60ba 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -300,12 +300,10 @@ if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) } my $Pid = $TA->Run(["./script.bat"], 0); -my $OldTimeout = $TA->SetTimeout($Task->Timeout); -if (!$Pid or !defined $TA->Wait($Pid)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); } -$TA->SetTimeout($OldTimeout); my $LogErrMessage; if (!$TA->GetFile($RptFileName, $FullLogFileName)) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index cda83a8..c3326d6 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -35,6 +35,7 @@ my $RPC_SENDFILE = 2; my $RPC_RUN = 3; my $RPC_WAIT = 4; my $RPC_RM = 5; +my $RPC_WAIT2 = 6; my %RpcNames=( $RPC_PING => 'ping', @@ -43,6 +44,7 @@ my %RpcNames=( $RPC_RUN => 'run', $RPC_WAIT => 'wait', $RPC_RM => 'rm', + $RPC_WAIT2 => 'wait2', ); my $Debug = 0; @@ -1053,21 +1055,38 @@ sub Run($$$;$$$) return $self->_RecvList('Q'); } -sub Wait($$) +sub Wait($$$) { - my ($self, $Pid) = @_; - debug("Wait $Pid\n"); + my ($self, $Pid, $Timeout) = @_; + debug("Wait $Pid, ", defined $Timeout ? $Timeout : "<undef>", "\n"); + # Add 1 second for the reply to come back + my $OldTimeout = $self->SetTimeout($Timeout + 1) if ($Timeout); # Send the command - if (!$self->_StartRPC($RPC_WAIT) or - !$self->_SendListSize(1) or - !$self->_SendUInt64($Pid)) + if ($self->{agentversion} =~ / 1\.0$/) { - return undef; + if (!$self->_StartRPC($RPC_WAIT) or + !$self->_SendListSize(1) or + !$self->_SendUInt64($Pid)) + { + return undef; + } + } + else + { + if (!$self->_StartRPC($RPC_WAIT2) or + !$self->_SendListSize(2) or + !$self->_SendUInt64($Pid) or + !$self->_SendUInt32($Timeout)) + { + return undef; + } } # Get the reply - return $self->_RecvList('I'); + my $Result = $self->_RecvList('I'); + $self->SetTimeout($OldTimeout) if ($Timeout); + return $Result; } sub Rm($@) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index d25a3d6..1424998 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -303,7 +303,7 @@ elsif ($Cmd eq "run") print "Started process $Pid\n"; if (!($RunFlags & $TestAgent::RUN_DNT)) { - $Result = $TA->Wait($Pid); + $Result = $TA->Wait($Pid, $Timeout); print "Child exit status: $Result\n" if (defined $Result); } }

1 0

Francois Gouget : testbot/testagentd: Add a wait() RPC that takes a timeout as a parameter.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 6475b701e628de35c632cecbf30f74e80aa91700 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6475b701e628de35c632cecb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:34:18 2013 +0100 testbot/testagentd: Add a wait() RPC that takes a timeout as a parameter. This is a new RPC which preserves compatibility with old clients. --- testbot/src/testagentd/platform.h | 6 ++-- testbot/src/testagentd/platform_unix.c | 25 ++++++++++++++++-- testbot/src/testagentd/platform_windows.c | 7 ++++- testbot/src/testagentd/testagentd.c | 38 +++++++++++++++++++++++++++- 4 files changed, 66 insertions(+), 10 deletions(-) diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 3c25271..d2a3934 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -68,12 +68,12 @@ enum run_flags_t { uint64_t platform_run(char** argv, uint32_t flags, char** redirects); /* If a command was started in the background, waits until either that command - * terminates or the client disconnects (typically because it got tired of - * waiting). + * terminates, the specified timeout (in seconds) expires, or the client + * disconnects (typically because it got tired of waiting). * If no command was started in the background, then reports an error * immediately. */ -int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus); +int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus); /* Returns a string describing the last socket-related error */ int sockeintr(void); diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index cd08c58..6552e05 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -28,6 +28,7 @@ #include <sys/stat.h> #include <sys/wait.h> #include <signal.h> +#include <time.h> #include "platform.h" #include "list.h" @@ -125,9 +126,10 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) return pid; } -int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) +int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus) { struct child_t* child; + time_t deadline; LIST_FOR_EACH_ENTRY(child, &children, struct child_t, entry) { @@ -140,10 +142,14 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) return 0; } + if (timeout) + deadline = time(NULL) + timeout; while (!child->reaped) { fd_set rfds; char buffer; + struct timeval tv; + int ready; /* select() blocks until either the client disconnects or until, or * the SIGCHLD signal indicates the child has exited. The recv() call @@ -152,8 +158,21 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) debug("Waiting for " U64FMT "\n", pid); FD_ZERO(&rfds); FD_SET(client, &rfds); - if (select(client+1, &rfds, NULL, NULL, NULL) == 1 && - FD_ISSET(client, &rfds) && + if (timeout) + { + tv.tv_sec = deadline - time(NULL); + if (tv.tv_sec < 0) + tv.tv_sec = 0; + tv.tv_usec = 0; + } + ready = select(client+1, &rfds, NULL, NULL, timeout ? &tv : NULL); + if (ready == 0) + { + /* This is the timeout */ + set_status(ST_ERROR, "timed out waiting for the child process"); + return 0; + } + if (ready == 1 && FD_ISSET(client, &rfds) && recv(client, &buffer, 1, MSG_PEEK | MSG_DONTWAIT) <= 0) { set_status(ST_FATAL, "connection closed"); diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index ab4bf7b..55ed51d 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -136,7 +136,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) return pi.dwProcessId; } -int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) +int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus) { struct child_t *child; HANDLE handles[2]; @@ -160,7 +160,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) handles[0] = WSACreateEvent(); WSAEventSelect(client, handles[0], FD_CLOSE); handles[1] = child->handle; - r = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + r = WaitForMultipleObjects(2, handles, FALSE, timeout * 1000); success = 0; switch (r) @@ -179,6 +179,9 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) else debug("GetExitCodeProcess() failed (%lu). Giving up!\n", GetLastError()); break; + case WAIT_TIMEOUT: + set_status(ST_ERROR, "timed out waiting for the child process"); + return 0; default: debug("WaitForMultipleObjects() returned %lu (le=%lu). Giving up!\n", r, GetLastError()); break; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 837ff02..8a8f2bb 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -29,7 +29,13 @@ #include "platform.h" -#define PROTOCOL_VERSION "testagentd 1.0" +/* Increase the major version number when making backward-incompatible changes. + * Otherwise increase the minor version number: + * 1.0: Initial release. + * 1.1: Added the wait2 RPC. + */ +#define PROTOCOL_VERSION "testagentd 1.1" + #define BLOCK_SIZE 4096 const char *name0; @@ -73,6 +79,7 @@ enum rpc_ids_t RPCID_RUN, RPCID_WAIT, RPCID_RM, + RPCID_WAIT2, }; /* This is the RPC currently being processed */ @@ -89,6 +96,7 @@ static const char* rpc_name(uint32_t id) "run", "wait", "rm", + "wait2", }; if (id < sizeof(names) / sizeof(*names)) @@ -761,7 +769,30 @@ static void do_wait(SOCKET client) return; } - if (platform_wait(client, pid, &childstatus)) + if (platform_wait(client, pid, 0, &childstatus)) + { + send_list_size(client, 1); + send_uint32(client, childstatus); + } + else + send_error(client); +} + +static void do_wait2(SOCKET client) +{ + uint64_t pid; + uint32_t timeout; + uint32_t childstatus; + + if (!expect_list_size(client, 2) || + !recv_uint64(client, &pid) || + !recv_uint32(client, &timeout)) + { + send_error(client); + return; + } + + if (platform_wait(client, pid, timeout, &childstatus)) { send_list_size(client, 1); send_uint32(client, childstatus); @@ -906,6 +937,9 @@ static void process_rpc(SOCKET client) case RPCID_WAIT: do_wait(client); break; + case RPCID_WAIT2: + do_wait2(client); + break; case RPCID_RM: do_rm(client); break;

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

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: 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: 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/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: 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

← Newer
1
...
7
8
9
10
11
12
13
...
46
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 February 2013