From b966a0f4a3b2d7d3405a8fed0cc67471206501e5 Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Sat, 10 Aug 2013 19:38:34 -0700 Subject: [PATCH] Use ps xww because w isn't wide enough on deb with long jenkins paths. --- lib/PerconaTest.pm | 2 +- t/lib/Daemon.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/PerconaTest.pm b/lib/PerconaTest.pm index 932ae4cd..4392541b 100644 --- a/lib/PerconaTest.pm +++ b/lib/PerconaTest.pm @@ -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"; diff --git a/t/lib/Daemon.t b/t/lib/Daemon.t index 5101a022..4ac90ebe 100644 --- a/t/lib/Daemon.t +++ b/t/lib/Daemon.t @@ -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";