percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-07 12:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add t/pt-archiver/version_check.t, v-c integration tests. Don't exit early if PTDEBUG && PTVCDEBUG (don't know what state the tool may be in).

Browse Source
This commit is contained in:
Daniel Nichter
2012-08-22 16:20:00 -06:00
parent 66f1bdf403
commit 639f47eb70
21 changed files with 403 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bin/pt-find
View File

@@ -2949,17 +2949,19 @@ eval {
sub version_check {
eval {
if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
PTDEBUG && _d('--version-check is disabled by PERCONA_VERSION_CHECK');
$ENV{PTVCDEBUG} && _d('--version-check is disabled by the',
'PERCONA_VERSION_CHECK environment variable');
if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
_d('--version-check is disabled by the PERCONA_VERSION_CHECK',
'environment variable');
}
return;
}
if ( !time_to_check($check_time_file) ) {
PTDEBUG && _d('Not time to do --version-check');
$ENV{PTVCDEBUG} && _d('It is not time to --version-checka again;',
'only 1 check per', $check_time_limit, 'seconds, and the last',
'check was performed on the modified time of', $check_time_file);
if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
_d('It is not time to --version-checka again;',
'only 1 check per', $check_time_limit, 'seconds, and the last',
'check was performed on the modified time of', $check_time_file);
}
return;
}
@@ -2973,13 +2975,14 @@ sub version_check {
print join("\n", map { "# * $_" } @$advice);
print "\n# Specify --no-version-check to disable these suggestions.\n\n";
}
elsif ( $ENV{PTVCDEBUG} ) {
elsif ( $ENV{PTVCDEBUG} || PTDEBUG ) {
_d('--version-check worked, but there were no suggestions');
}
};
if ( $EVAL_ERROR ) {
PTDEBUG && _d('Error doing --version-check:', $EVAL_ERROR);
$ENV{PTVCDEBUG} && _d('Error doing --version-check:', $EVAL_ERROR);
if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
_d('Error doing --version-check:', $EVAL_ERROR);
}
}
return;
@@ -3523,7 +3526,6 @@ sub main {
# ########################################################################
if ( $o->get('version-check') && ($o->has('quiet') && !$o->get('quiet')) ) {
Pingback::version_check($dbh);
return 0 if $ENV{PTVCDEBUG} && PTDEBUG;
}
# ########################################################################