percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-13 14:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged fix-831525-pqd-mangled-help

Browse Source
This commit is contained in:
Brian Fraser
2012-11-29 17:10:54 -03:00
parent 713457226a 5e838050b6
commit cddead8a69
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-query-digest
View File

@@ -1373,7 +1373,7 @@ sub print_usage {
$desc .= ". Optional suffix s=seconds, m=minutes, h=hours, " $desc .= ". Optional suffix s=seconds, m=minutes, h=hours, "
. "d=days; if no suffix, $s is used."; . "d=days; if no suffix, $s is used.";
} }
$desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol})(?:\s+|$)/g); $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol}(?!\W))(?:\s+|(?<=\W)|$)/g);
$desc =~ s/ +$//mg; $desc =~ s/ +$//mg;
if ( $short ) { if ( $short ) {
$usage .= sprintf(" --%-${maxs}s -%s %s\n", $long, $short, $desc); $usage .= sprintf(" --%-${maxs}s -%s %s\n", $long, $short, $desc);

2
lib/OptionParser.pm
View File

@@ -1074,7 +1074,7 @@ sub print_usage {
. "d=days; if no suffix, $s is used."; . "d=days; if no suffix, $s is used.";
} }
# Wrap long descriptions # Wrap long descriptions
$desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol})(?:\s+|$)/g); $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol}(?!\W))(?:\s+|(?<=\W)|$)/g);
$desc =~ s/ +$//mg; $desc =~ s/ +$//mg;
if ( $short ) { if ( $short ) {
$usage .= sprintf(" --%-${maxs}s -%s %s\n", $long, $short, $desc); $usage .= sprintf(" --%-${maxs}s -%s %s\n", $long, $short, $desc);

22
t/pt-query-digest/option_sanity.t
View File

@@ -9,7 +9,7 @@ BEGIN {
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More tests => 6; use Test::More;
use PerconaTest; use PerconaTest;
@@ -57,8 +57,24 @@ $output = `$trunk/bin/pt-query-digest @options --embedded-attributes '-- .*,[:al
like $output, like $output,
qr/\Q--embedded-attributes POSIX syntax [: :] belongs inside character/, qr/\Q--embedded-attributes POSIX syntax [: :] belongs inside character/,
"Bug 885382: --embedded-attributes rejects warning patterns early";; "Bug 885382: --embedded-attributes rejects warning patterns early";;
# #############################################################################
# pt-query-digest help output mangled
# https://bugs.launchpad.net/percona-toolkit/+bug/831525
# #############################################################################
$output = `$trunk/bin/pt-query-digest --help`;
like(
$output,
qr/\Q--report-format=A\E\s*
\QPrint these sections of the query analysis\E\s*
\Qreport (default rusage,date,hostname,files,\E\s*
\Qheader,profile,query_report,prepared)\E/x,
"Bug 831525: pt-query-digest help output mangled"
);
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
exit; done_testing;