percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-01 18:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ps xww because w isn't wide enough on deb with long jenkins paths.

Browse Source
This commit is contained in:
Daniel Nichter
2013-08-10 19:38:34 -07:00
parent fe0e2f21c0
commit b966a0f4a3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/PerconaTest.pm
View File

@@ -823,7 +823,7 @@ sub get_cmd_pid {
my $cmd = shift;
$cmd =~ s/\./\\./g;
$cmd =~ s/-/\\-/g;
my $output = `ps wx | grep -v grep | grep '$cmd'`;
my $output = `ps xww | grep -v grep | grep '$cmd'`;
my @cmds = $output =~ m/\n/g;
if ( @cmds > 1 ) {
die "Found " . scalar @cmds . " commands matching '$cmd': @cmds";

2
t/lib/Daemon.t
View File

@@ -143,7 +143,7 @@ SKIP: {
PerconaTest::wait_for_files($pid_file, $log_file)
or die "$cmd did not create $pid_file and $log_file";
my $pid = PerconaTest::get_cmd_pid("$cmd 15")
or die "Cannot get PID of $cmd 15\n" . `ps xw`;
or die "Cannot get PID of $cmd 15\n" . `ps xww`;
my $proc_fd_0 = -l "/proc/$pid/0" ? "/proc/$pid/0"
: -l "/proc/$pid/fd/0" ? "/proc/$pid/fd/0"
: die "Cannot find fd 0 symlink in /proc/$pid";