diff --git a/t/pt-index-usage/basics.t b/t/pt-index-usage/basics.t index ff5bc3ae..5e2e0721 100644 --- a/t/pt-index-usage/basics.t +++ b/t/pt-index-usage/basics.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More; use PerconaTest; -# See http://code.google.com/p/maatkit/wiki/Testing -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-index-usage"; use Sandbox; diff --git a/t/pt-index-usage/save_results.t b/t/pt-index-usage/save_results.t index 5275f58a..93a44ecf 100644 --- a/t/pt-index-usage/save_results.t +++ b/t/pt-index-usage/save_results.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More; use PerconaTest; -# See http://code.google.com/p/maatkit/wiki/Testing -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-index-usage"; use Sandbox; diff --git a/t/pt-query-advisor/checks.t b/t/pt-query-advisor/checks.t index c337559c..1640ea09 100644 --- a/t/pt-query-advisor/checks.t +++ b/t/pt-query-advisor/checks.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 13; use PerconaTest; -shift @INC; # These two shifts are required for tools that use base and -shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t require "$trunk/bin/pt-query-advisor"; my @args = qw(--print-all --report-format full --group-by none --query); diff --git a/t/pt-query-advisor/get_create_table.t b/t/pt-query-advisor/get_create_table.t index 9f202e03..f9119009 100644 --- a/t/pt-query-advisor/get_create_table.t +++ b/t/pt-query-advisor/get_create_table.t @@ -13,9 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # These two shifts are required for tools that use base and -shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t -shift @INC; require "$trunk/bin/pt-query-advisor"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-query-advisor/group_by.t b/t/pt-query-advisor/group_by.t index 6f2f9044..d3152f9b 100644 --- a/t/pt-query-advisor/group_by.t +++ b/t/pt-query-advisor/group_by.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 3; use PerconaTest; -shift @INC; # These two shifts are required for tools that use base and -shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t require "$trunk/bin/pt-query-advisor"; ok( diff --git a/t/pt-query-advisor/ignore_rules.t b/t/pt-query-advisor/ignore_rules.t index 593bad44..dbd05bac 100644 --- a/t/pt-query-advisor/ignore_rules.t +++ b/t/pt-query-advisor/ignore_rules.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 1; use PerconaTest; -shift @INC; # These two shifts are required for tools that use base and -shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t require "$trunk/bin/pt-query-advisor"; my @args = qw(--print-all --report-format full --group-by none); diff --git a/t/pt-query-advisor/parse_logs.t b/t/pt-query-advisor/parse_logs.t index 6a6b518c..5e7f56a1 100644 --- a/t/pt-query-advisor/parse_logs.t +++ b/t/pt-query-advisor/parse_logs.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 2; use PerconaTest; -shift @INC; # These two shifts are required for tools that use base and -shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t require "$trunk/bin/pt-query-advisor"; my $output; diff --git a/t/pt-query-advisor/review.t b/t/pt-query-advisor/review.t index c38d09db..17f14391 100644 --- a/t/pt-query-advisor/review.t +++ b/t/pt-query-advisor/review.t @@ -13,9 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # These two shifts are required for tools that use base and -shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t -shift @INC; require "$trunk/bin/pt-query-advisor"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-query-digest/binlog_analyses.t b/t/pt-query-digest/binlog_analyses.t index 6f745afc..a3e6c4bc 100644 --- a/t/pt-query-digest/binlog_analyses.t +++ b/t/pt-query-digest/binlog_analyses.t @@ -12,11 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 2; use PerconaTest; - -# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift - require "$trunk/bin/pt-query-digest"; # ############################################################################# diff --git a/t/pt-query-digest/bugs.t b/t/pt-query-digest/bugs.t index ab025cfd..9c222ba7 100644 --- a/t/pt-query-digest/bugs.t +++ b/t/pt-query-digest/bugs.t @@ -13,10 +13,6 @@ use Test::More; use Sandbox; use PerconaTest; -# See 101_slowlog_analyses.t for why we shift. -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift -shift @INC; # Sandbox require "$trunk/bin/pt-query-digest"; diff --git a/t/pt-query-digest/continue_on_error.t b/t/pt-query-digest/continue_on_error.t index dd7ad714..c52380e3 100644 --- a/t/pt-query-digest/continue_on_error.t +++ b/t/pt-query-digest/continue_on_error.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 3; use PerconaTest; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-query-digest"; my $output; diff --git a/t/pt-query-digest/execute.t b/t/pt-query-digest/execute.t index 00247bdd..75b51203 100644 --- a/t/pt-query-digest/execute.t +++ b/t/pt-query-digest/execute.t @@ -13,10 +13,6 @@ use Test::More; use Sandbox; use PerconaTest; -# See 101_slowlog_analyses.t for why we shift. -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift -shift @INC; # Sandbox require "$trunk/bin/pt-query-digest"; diff --git a/t/pt-query-digest/explain.t b/t/pt-query-digest/explain.t index f9aed342..50b6a3a5 100644 --- a/t/pt-query-digest/explain.t +++ b/t/pt-query-digest/explain.t @@ -13,10 +13,6 @@ use Test::More; use Sandbox; use PerconaTest; -# See 101_slowlog_analyses.t for why we shift. -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift -shift @INC; # Sandbox require "$trunk/bin/pt-query-digest"; diff --git a/t/pt-query-digest/genlog_analyses.t b/t/pt-query-digest/genlog_analyses.t index 43fab81e..14c283c7 100644 --- a/t/pt-query-digest/genlog_analyses.t +++ b/t/pt-query-digest/genlog_analyses.t @@ -13,10 +13,6 @@ use Test::More tests => 4; use PerconaTest; -# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift - require "$trunk/bin/pt-query-digest"; # ############################################################################# diff --git a/t/pt-query-digest/issue_736.t b/t/pt-query-digest/issue_736.t index 7d987e2b..37fe346d 100644 --- a/t/pt-query-digest/issue_736.t +++ b/t/pt-query-digest/issue_736.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 1; use PerconaTest; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-query-digest"; # ############################################################################# diff --git a/t/pt-query-digest/mysql_analyses.t b/t/pt-query-digest/mysql_analyses.t index f27f81e3..73632b76 100644 --- a/t/pt-query-digest/mysql_analyses.t +++ b/t/pt-query-digest/mysql_analyses.t @@ -13,10 +13,6 @@ use Test::More tests => 6; use PerconaTest; -# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift - require "$trunk/bin/pt-query-digest"; my @args = qw(--type tcpdump --report-format=query_report --limit 10); diff --git a/t/pt-query-digest/outliers.t b/t/pt-query-digest/outliers.t index cba43cf1..bfbedd8a 100644 --- a/t/pt-query-digest/outliers.t +++ b/t/pt-query-digest/outliers.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 2; use PerconaTest; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-query-digest"; my @args = qw(--report-format=query_report); diff --git a/t/pt-query-digest/pglog_analyses.t b/t/pt-query-digest/pglog_analyses.t index 4a46cf65..6d018be5 100644 --- a/t/pt-query-digest/pglog_analyses.t +++ b/t/pt-query-digest/pglog_analyses.t @@ -13,10 +13,6 @@ use Test::More tests => 2; use PerconaTest; -# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift - require "$trunk/bin/pt-query-digest"; # ############################################################################# diff --git a/t/pt-query-digest/prepared_statements_analyses.t b/t/pt-query-digest/prepared_statements_analyses.t index f5c9a422..c24e8473 100644 --- a/t/pt-query-digest/prepared_statements_analyses.t +++ b/t/pt-query-digest/prepared_statements_analyses.t @@ -13,10 +13,6 @@ use Test::More tests => 7; use PerconaTest; -# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift - require "$trunk/bin/pt-query-digest"; my @args = qw(--type tcpdump --report-format=query_report --limit 10 --watch-server 127.0.0.1:12345); diff --git a/t/pt-query-digest/processlist.t b/t/pt-query-digest/processlist.t index 5d0f8b6c..0654db34 100644 --- a/t/pt-query-digest/processlist.t +++ b/t/pt-query-digest/processlist.t @@ -13,9 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; -shift @INC; -shift @INC; require "$trunk/bin/pt-query-digest"; use Data::Dumper; diff --git a/t/pt-query-digest/rawlog_analyses.t b/t/pt-query-digest/rawlog_analyses.t index 7bc30acb..75cfa784 100644 --- a/t/pt-query-digest/rawlog_analyses.t +++ b/t/pt-query-digest/rawlog_analyses.t @@ -13,10 +13,6 @@ use Test::More tests => 2; use PerconaTest; -# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift - require "$trunk/bin/pt-query-digest"; # ############################################################################# diff --git a/t/pt-query-digest/report_histogram.t b/t/pt-query-digest/report_histogram.t index 41f766cd..f61b219b 100644 --- a/t/pt-query-digest/report_histogram.t +++ b/t/pt-query-digest/report_histogram.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 1; use PerconaTest; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-query-digest"; my @args = ('--report-format', 'query_report,profile', qw(--limit 10)); diff --git a/t/pt-query-digest/review.t b/t/pt-query-digest/review.t index 6cc38fb8..bf980c3d 100644 --- a/t/pt-query-digest/review.t +++ b/t/pt-query-digest/review.t @@ -13,9 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; -shift @INC; -shift @INC; require "$trunk/bin/pt-query-digest"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-query-digest/run_time.t b/t/pt-query-digest/run_time.t index 1ebd9afc..140a8ae1 100644 --- a/t/pt-query-digest/run_time.t +++ b/t/pt-query-digest/run_time.t @@ -14,9 +14,6 @@ use Test::More; use PerconaTest; use Sandbox; use Time::HiRes qw(sleep); -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift -shift @INC; # Sandbox's unshift require "$trunk/bin/pt-query-digest"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-query-digest/slowlog_analyses.t b/t/pt-query-digest/slowlog_analyses.t index 254d4595..0da55e18 100644 --- a/t/pt-query-digest/slowlog_analyses.t +++ b/t/pt-query-digest/slowlog_analyses.t @@ -13,17 +13,6 @@ use Test::More tests => 44; use PerconaTest; -# Normally we want $trunk/common in @INC so we can "use MaakitTest" and -# other modules path-independently. However, mk-query-digest uses -# HTMLProtocolParser which is a subclass of ProtocolParser, so the former -# must "use base 'ProtocolParser'" which causes Perl to load ProtocolParser -# from @INC. This causes errors about ProtocolParser::new() being redefined: -# once in mk-query-digest's copy of the module and again from the actual -# module in $trunk/common. We remove $trunk/common from @INC so Perl won't -# find/load it again.\n -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift - require "$trunk/bin/pt-query-digest"; # ############################################################################# diff --git a/t/pt-query-digest/statistics.t b/t/pt-query-digest/statistics.t index c0cbc97e..6609f592 100644 --- a/t/pt-query-digest/statistics.t +++ b/t/pt-query-digest/statistics.t @@ -13,10 +13,6 @@ use Test::More tests => 1; use PerconaTest; -# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift - require "$trunk/bin/pt-query-digest"; my @args = qw(--no-report --statistics); diff --git a/t/pt-query-digest/variations.t b/t/pt-query-digest/variations.t index 35750bad..c5865578 100644 --- a/t/pt-query-digest/variations.t +++ b/t/pt-query-digest/variations.t @@ -13,8 +13,6 @@ use Test::More tests => 1; use PerconaTest; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-query-digest"; diff --git a/t/pt-query-digest/verify_run_time.t b/t/pt-query-digest/verify_run_time.t index acf1f182..d1260908 100644 --- a/t/pt-query-digest/verify_run_time.t +++ b/t/pt-query-digest/verify_run_time.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 18; use PerconaTest; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-query-digest"; my $m = 60; diff --git a/t/pt-table-checksum/basics.t b/t/pt-table-checksum/basics.t index 88af4f9b..125c0362 100644 --- a/t/pt-table-checksum/basics.t +++ b/t/pt-table-checksum/basics.t @@ -21,9 +21,6 @@ use Data::Dumper; use PerconaTest; use Sandbox; -# Fix @INC because pt-table-checksum uses subclass OobNibbleIterator. -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/bugs.t b/t/pt-table-checksum/bugs.t index f31e6a86..64f6b032 100644 --- a/t/pt-table-checksum/bugs.t +++ b/t/pt-table-checksum/bugs.t @@ -21,9 +21,6 @@ use Data::Dumper; use PerconaTest; use Sandbox; -# Fix @INC because pt-table-checksum uses subclass OobNibbleIterator. -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/char_chunking.t b/t/pt-table-checksum/char_chunking.t index 1ea45a63..756c7395 100644 --- a/t/pt-table-checksum/char_chunking.t +++ b/t/pt-table-checksum/char_chunking.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/chunk_index.t b/t/pt-table-checksum/chunk_index.t index fbc46f28..8ddefaae 100644 --- a/t/pt-table-checksum/chunk_index.t +++ b/t/pt-table-checksum/chunk_index.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/chunk_size.t b/t/pt-table-checksum/chunk_size.t index 98d243f0..cb170bfb 100644 --- a/t/pt-table-checksum/chunk_size.t +++ b/t/pt-table-checksum/chunk_size.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/create_replicate_table.t b/t/pt-table-checksum/create_replicate_table.t index d7cbc741..7f9d27e4 100644 --- a/t/pt-table-checksum/create_replicate_table.t +++ b/t/pt-table-checksum/create_replicate_table.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/error_handling.t b/t/pt-table-checksum/error_handling.t index 1a14bbbb..71d3f69a 100644 --- a/t/pt-table-checksum/error_handling.t +++ b/t/pt-table-checksum/error_handling.t @@ -15,8 +15,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/filters.t b/t/pt-table-checksum/filters.t index f2d65912..f9ea4a90 100644 --- a/t/pt-table-checksum/filters.t +++ b/t/pt-table-checksum/filters.t @@ -14,8 +14,6 @@ use Test::More; use Data::Dumper; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/float_precision.t b/t/pt-table-checksum/float_precision.t index 11e95839..3f0166ae 100644 --- a/t/pt-table-checksum/float_precision.t +++ b/t/pt-table-checksum/float_precision.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/fnv_64.t b/t/pt-table-checksum/fnv_64.t index 3ee9da28..386395d9 100644 --- a/t/pt-table-checksum/fnv_64.t +++ b/t/pt-table-checksum/fnv_64.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/ignore_columns.t b/t/pt-table-checksum/ignore_columns.t index 56e4f8c0..51116d0f 100644 --- a/t/pt-table-checksum/ignore_columns.t +++ b/t/pt-table-checksum/ignore_columns.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/issue_388.t b/t/pt-table-checksum/issue_388.t index 58d69b65..1f248e69 100644 --- a/t/pt-table-checksum/issue_388.t +++ b/t/pt-table-checksum/issue_388.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/issue_47.t b/t/pt-table-checksum/issue_47.t index ca79c270..26ea63d1 100644 --- a/t/pt-table-checksum/issue_47.t +++ b/t/pt-table-checksum/issue_47.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/issue_602.t b/t/pt-table-checksum/issue_602.t index ca801e56..70de9c1e 100644 --- a/t/pt-table-checksum/issue_602.t +++ b/t/pt-table-checksum/issue_602.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/option_sanity.t b/t/pt-table-checksum/option_sanity.t index 0e17cbbd..58de51bd 100644 --- a/t/pt-table-checksum/option_sanity.t +++ b/t/pt-table-checksum/option_sanity.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More; use PerconaTest; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $output; diff --git a/t/pt-table-checksum/privs.t b/t/pt-table-checksum/privs.t index 270ac575..52f8e5c0 100644 --- a/t/pt-table-checksum/privs.t +++ b/t/pt-table-checksum/privs.t @@ -22,8 +22,6 @@ use PerconaTest; use Sandbox; # Fix @INC because pt-table-checksum uses subclass OobNibbleIterator. -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/progress.t b/t/pt-table-checksum/progress.t index 2a2c890e..c4c5eb64 100644 --- a/t/pt-table-checksum/progress.t +++ b/t/pt-table-checksum/progress.t @@ -19,8 +19,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/replication_filters.t b/t/pt-table-checksum/replication_filters.t index 697e1957..1ff5db47 100644 --- a/t/pt-table-checksum/replication_filters.t +++ b/t/pt-table-checksum/replication_filters.t @@ -24,8 +24,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; use Data::Dumper; diff --git a/t/pt-table-checksum/resume.t b/t/pt-table-checksum/resume.t index 02875469..ed50b0fd 100644 --- a/t/pt-table-checksum/resume.t +++ b/t/pt-table-checksum/resume.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/run_time.t b/t/pt-table-checksum/run_time.t index 940e9506..32e98f6b 100644 --- a/t/pt-table-checksum/run_time.t +++ b/t/pt-table-checksum/run_time.t @@ -18,8 +18,6 @@ $Data::Dumper::Quotekeys = 0; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/skip_innodb.t b/t/pt-table-checksum/skip_innodb.t index 15797f22..383d34b0 100644 --- a/t/pt-table-checksum/skip_innodb.t +++ b/t/pt-table-checksum/skip_innodb.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; diag("Stopping/reconfiguring/restarting sandboxes 12348 and 12349"); diff --git a/t/pt-table-checksum/standard_options.t b/t/pt-table-checksum/standard_options.t index 2968da28..9f34421f 100644 --- a/t/pt-table-checksum/standard_options.t +++ b/t/pt-table-checksum/standard_options.t @@ -13,8 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-table-checksum/throttle.t b/t/pt-table-checksum/throttle.t index 0feb7418..ff335369 100644 --- a/t/pt-table-checksum/throttle.t +++ b/t/pt-table-checksum/throttle.t @@ -19,8 +19,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1; use PerconaTest; use Sandbox; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-table-checksum"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-tcp-model/analyses.t b/t/pt-tcp-model/analyses.t index d3bb400a..13ba8918 100644 --- a/t/pt-tcp-model/analyses.t +++ b/t/pt-tcp-model/analyses.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More; use PerconaTest; -shift @INC; # our unshift (above) -shift @INC; # PerconaTest's unshift require "$trunk/bin/pt-tcp-model"; diff --git a/t/pt-variable-advisor/option_sanity.t b/t/pt-variable-advisor/option_sanity.t index 372b4e1f..1eb4b800 100644 --- a/t/pt-variable-advisor/option_sanity.t +++ b/t/pt-variable-advisor/option_sanity.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More tests => 2; use PerconaTest; -shift @INC; # These shifts are required for tools that use base and derived -shift @INC; # classes. See mk-query-digest/t/101_slowlog_analyses.t require "$trunk/bin/pt-variable-advisor"; my $cmd = "$trunk/bin/pt-variable-advisor"; diff --git a/t/pt-variable-advisor/show_variables_online.t b/t/pt-variable-advisor/show_variables_online.t index a0bf1303..587dfa1f 100644 --- a/t/pt-variable-advisor/show_variables_online.t +++ b/t/pt-variable-advisor/show_variables_online.t @@ -13,9 +13,6 @@ use Test::More; use PerconaTest; use Sandbox; -shift @INC; # These shifts are required for tools that use base and derived -shift @INC; # classes. See mk-query-digest/t/101_slowlog_analyses.t -shift @INC; require "$trunk/bin/pt-variable-advisor"; my $dp = new DSNParser(opts=>$dsn_opts); diff --git a/t/pt-variable-advisor/show_variables_static.t b/t/pt-variable-advisor/show_variables_static.t index 539ca2e1..28266795 100644 --- a/t/pt-variable-advisor/show_variables_static.t +++ b/t/pt-variable-advisor/show_variables_static.t @@ -12,8 +12,6 @@ use English qw(-no_match_vars); use Test::More; use PerconaTest; -shift @INC; # These two shifts are required for tools that use base and -shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t require "$trunk/bin/pt-variable-advisor"; # #############################################################################