Bug 1321662 - Ensure that Carp and Carp::Heavy are only loaded after @INC is setup...

diff --git a/contrib/clear-memcached.pl b/contrib/clear-memcached.pl
index 31fe3bb00e9c34385890ae72def966eca830077d..58157770a4b06e6825949415cffa4e98ba2d3df2 100755 (executable)
--- a/contrib/clear-memcached.pl
+++ b/contrib/clear-memcached.pl
@@ -9,9 +9,7 @@
 
 use strict;
 use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/contrib/clear-templates.pl b/contrib/clear-templates.pl
index ba89cb6d58f19da662ea149e6e3abcfd2d52a707..5954e71ad81bdd6cc51e57dd8ea820ccad1b895b 100755 (executable)
--- a/contrib/clear-templates.pl
+++ b/contrib/clear-templates.pl
@@ -9,8 +9,7 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/contrib/fixperms.pl b/contrib/fixperms.pl
index 3246fc06ba76d4aa82bc3a7d1df47b614c545e62..e92a311387228f886abbceb4b4445ecef9fefcda 100755 (executable)
--- a/contrib/fixperms.pl
+++ b/contrib/fixperms.pl
@@ -21,8 +21,7 @@
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Install::Filesystem qw(fix_all_file_permissions);

diff --git a/contrib/nagios_blocker_checker.pl b/contrib/nagios_blocker_checker.pl
index f0d18f50906a5c2544a9f3275fd6a2a98ca60098..711f54a1d7a4c05a88db3aca13c07e4faa68c328 100755 (executable)
--- a/contrib/nagios_blocker_checker.pl
+++ b/contrib/nagios_blocker_checker.pl
@@ -9,10 +9,7 @@
 
 use strict;
 use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
-
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/email_in.pl b/email_in.pl
index 0e61bf8f191a0104f88ad0cfda278279c2b96711..f36ddb2a19833caaf1294d6fa82e427d7a430e96 100755 (executable)
--- a/email_in.pl
+++ b/email_in.pl
@@ -10,13 +10,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use FindBin;
-BEGIN {
-    require lib;
-    my ($bin) = $FindBin::Bin =~ /^(.*)$/;
-
-    lib->import("$bin", "$bin/lib", "$bin/local/lib/perl5");
-}
+use lib qw(. lib local/lib/perl5);
 
 # MTAs may call this script from any directory, but it should always
 # run from this one so that it can find its modules.

diff --git a/extensions/BMO/bin/bug_1022707.pl b/extensions/BMO/bin/bug_1022707.pl
index b0a49aa65464902fd7b888891a9002f4c06964f0..b7a11a03402e6b987fb84e3b15b6001ae5ddcab5 100755 (executable)
--- a/extensions/BMO/bin/bug_1022707.pl
+++ b/extensions/BMO/bin/bug_1022707.pl
@@ -10,8 +10,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants qw( USAGE_MODE_CMDLINE );

diff --git a/extensions/BMO/bin/bug_1093952.pl b/extensions/BMO/bin/bug_1093952.pl
index a784e63a3c8e9dca9c534030668af28198d25bf6..757a663f6c1a3347782793db5839b2c4abb246cb 100755 (executable)
--- a/extensions/BMO/bin/bug_1093952.pl
+++ b/extensions/BMO/bin/bug_1093952.pl
@@ -9,8 +9,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Component;

diff --git a/extensions/BMO/bin/bug_1141452.pl b/extensions/BMO/bin/bug_1141452.pl
index d2d260d7b64d43e3211271785ff8ff90fc840d75..435ee3b5326658753639c2a0805a0a6f2a033eb9 100755 (executable)
--- a/extensions/BMO/bin/bug_1141452.pl
+++ b/extensions/BMO/bin/bug_1141452.pl
@@ -9,8 +9,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     use Bugzilla;

diff --git a/extensions/BMO/bin/migrate-github-pull-requests.pl b/extensions/BMO/bin/migrate-github-pull-requests.pl
index 11bf8c55fbfb54498cf7ab775a689042f28dbe2e..bcf0ec85c77963e9be4b3d7cf70ef5b69e9efe8b 100755 (executable)
--- a/extensions/BMO/bin/migrate-github-pull-requests.pl
+++ b/extensions/BMO/bin/migrate-github-pull-requests.pl
@@ -10,8 +10,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }

diff --git a/extensions/MozReview/bin/add-mozreview-children.pl b/extensions/MozReview/bin/add-mozreview-children.pl
index f92c2a19bc522d0d959b0117da9540a55b7e5754..4835e1c25ba05e8a8d8068c0e2d32eb56508c0be 100755 (executable)
--- a/extensions/MozReview/bin/add-mozreview-children.pl
+++ b/extensions/MozReview/bin/add-mozreview-children.pl
@@ -14,8 +14,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     use Bugzilla;

diff --git a/extensions/Push/bin/bugzilla-pushd.pl b/extensions/Push/bin/bugzilla-pushd.pl
index 8e92381f36247dafb78796b80588d645b7f639fb..3faed5f00196311722b0c448de9ba8999344b37e 100755 (executable)
--- a/extensions/Push/bin/bugzilla-pushd.pl
+++ b/extensions/Push/bin/bugzilla-pushd.pl
@@ -10,8 +10,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     use Bugzilla;

diff --git a/extensions/Push/bin/nagios_push_checker.pl b/extensions/Push/bin/nagios_push_checker.pl
index 092a9da8fc1682fd8543a0db8839e46d779a991b..725e699ec16d2306f70d9c2bbd905ff7706e4f0a 100755 (executable)
--- a/extensions/Push/bin/nagios_push_checker.pl
+++ b/extensions/Push/bin/nagios_push_checker.pl
@@ -10,8 +10,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/extensions/RequestNagger/bin/send-request-nags.pl b/extensions/RequestNagger/bin/send-request-nags.pl
index b3c654956218d4af22c2fb1cd0b7fde7363f8b11..d9da4f04be47c3ffa7553d24dc7260f6794784e4 100755 (executable)
--- a/extensions/RequestNagger/bin/send-request-nags.pl
+++ b/extensions/RequestNagger/bin/send-request-nags.pl
@@ -10,8 +10,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }

diff --git a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
index ff109a5af42dadad3a3168cbd8ce832750a0cc07..c6b69006fc5a8b51f95343e7d6b387500fffeef3 100755 (executable)
--- a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
+++ b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
@@ -12,8 +12,7 @@ use strict;
 use warnings;
 $| = 1;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }

diff --git a/extensions/Review/bin/review_requests_rebuild.pl b/extensions/Review/bin/review_requests_rebuild.pl
index 6574f3dbe7ce51c411005dfe144d9ea3057a1d03..df9a99774ab4662cfb9f69f11bbc80386de1e0c7 100755 (executable)
--- a/extensions/Review/bin/review_requests_rebuild.pl
+++ b/extensions/Review/bin/review_requests_rebuild.pl
@@ -11,8 +11,7 @@ use strict;
 use warnings;
 $| = 1;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }

diff --git a/extensions/TrackingFlags/bin/bug_825946.pl b/extensions/TrackingFlags/bin/bug_825946.pl
index 8f48a671a094565c367ec66779aa99d228cdda1b..20d21aea53632633cf40b8530df93e853bc7fbcd 100755 (executable)
--- a/extensions/TrackingFlags/bin/bug_825946.pl
+++ b/extensions/TrackingFlags/bin/bug_825946.pl
@@ -9,8 +9,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     use Bugzilla;

diff --git a/extensions/TrackingFlags/bin/bulk_flag_clear.pl b/extensions/TrackingFlags/bin/bulk_flag_clear.pl
index 6b05a50a3cf674404883c1f120bb69536c457fa1..e599d8e516a4437a8f4cfac7fe6075d144dfaa83 100755 (executable)
--- a/extensions/TrackingFlags/bin/bulk_flag_clear.pl
+++ b/extensions/TrackingFlags/bin/bulk_flag_clear.pl
@@ -9,8 +9,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     use Bugzilla;

diff --git a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
index bca03f9f9a7befa6e39de2f6347e771c88ab0cda..0081462d9957607057c47b65ee736e9e1ab15c20 100755 (executable)
--- a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
+++ b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
@@ -12,8 +12,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     use Bugzilla;

diff --git a/extensions/UserProfile/bin/migrate.pl b/extensions/UserProfile/bin/migrate.pl
index 2cde3ce2cb82bc574daa72c1b039ea10450cc66c..3b7057af8994435f9eceba5baa07dc48cf80ef01 100755 (executable)
--- a/extensions/UserProfile/bin/migrate.pl
+++ b/extensions/UserProfile/bin/migrate.pl
@@ -11,8 +11,7 @@ use strict;
 use warnings;
 $| = 1;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }

diff --git a/extensions/UserProfile/bin/update.pl b/extensions/UserProfile/bin/update.pl
index af9a81774b2dea0caa724ffe228c8f9d7e34b774..8f59646ae9ef3cb79976db69edc6b03989f4fd38 100755 (executable)
--- a/extensions/UserProfile/bin/update.pl
+++ b/extensions/UserProfile/bin/update.pl
@@ -10,8 +10,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }

diff --git a/metrics.pl b/metrics.pl
index afcd7d22dba87b26c4cd44d3537193515cbb219a..b181ebf32d502505af33f5e6675eb2dccb53fe00 100755 (executable)
--- a/metrics.pl
+++ b/metrics.pl
@@ -10,13 +10,9 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 
-BEGIN {
-    delete $ENV{SERVER_SOFTWARE};
-}
-
-use FindBin qw($RealBin);
-use lib ("$RealBin/.", "$RealBin/lib", "$RealBin/local/lib/perl5");
+BEGIN { delete $ENV{SERVER_SOFTWARE}; }
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/qa/t/rest_bugzilla.t b/qa/t/rest_bugzilla.t
index cffab80db1b47ba2759cb0af3bfcea06412e8c74..01ee6af65977b6b88645f9a79538605360a902df 100644 (file)
--- a/qa/t/rest_bugzilla.t
+++ b/qa/t/rest_bugzilla.t
@@ -12,9 +12,7 @@
 use 5.10.1;
 use strict;
 use warnings;
-
-use FindBin qw($RealBin);
-use lib "$RealBin/lib", "$RealBin/../../lib", "$RealBin/../../local/lib/perl5";
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More tests => 11;
 use QA::REST;

diff --git a/qa/t/rest_classification.t b/qa/t/rest_classification.t
index d3806680abb5d31d144ecf5953f9091f1681ef96..f5485de2bf07ab44dec15475ae64f1d0f8b89844 100644 (file)
--- a/qa/t/rest_classification.t
+++ b/qa/t/rest_classification.t
@@ -12,9 +12,7 @@
 use 5.10.1;
 use strict;
 use warnings;
-
-use FindBin qw($RealBin);
-use lib "$RealBin/lib", "$RealBin/../../lib", "$RealBin/../../local/lib/perl5";
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More tests => 7;
 use QA::REST;

diff --git a/qa/t/test_bmo_autolinkification.t b/qa/t/test_bmo_autolinkification.t
index 5203011657721e587e03e53edbac043630048286..af61f09a4184295d02708386a8ee5979c27798dd 100644 (file)
--- a/qa/t/test_bmo_autolinkification.t
+++ b/qa/t/test_bmo_autolinkification.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_bmo_enter_new_bug.t b/qa/t/test_bmo_enter_new_bug.t
index fde8758d0eb8badae4d55d925a8e901c4c949565..702d067a1eea859e778acd6b6f5a9e7eac64a3d9 100644 (file)
--- a/qa/t/test_bmo_enter_new_bug.t
+++ b/qa/t/test_bmo_enter_new_bug.t
@@ -14,7 +14,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_bmo_retire_values.t b/qa/t/test_bmo_retire_values.t
index f6086e0f90d2d1074242a514165da9f26423ad65..3a74e8966d44745f7027ecfd1dc2ddd2fcb37fdd 100644 (file)
--- a/qa/t/test_bmo_retire_values.t
+++ b/qa/t/test_bmo_retire_values.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_bug_edit.t b/qa/t/test_bug_edit.t
index ae72aa127665e46aeed151d1d96d98d5a708c9bc..8e42a139da828d51047c563d20263a06a3fc2f82 100644 (file)
--- a/qa/t/test_bug_edit.t
+++ b/qa/t/test_bug_edit.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_choose_priority.t b/qa/t/test_choose_priority.t
index a35823327debfe584be2065aa49e779eeb2ebb49..95f401e663a5351284679874b54601199ca6416c 100644 (file)
--- a/qa/t/test_choose_priority.t
+++ b/qa/t/test_choose_priority.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_classifications.t b/qa/t/test_classifications.t
index ec5597d9eec45afd6ca4aae4f53315abe14c6ed6..a30e72018b94a035ab8ac17caf6b0ed76f120d90 100644 (file)
--- a/qa/t/test_classifications.t
+++ b/qa/t/test_classifications.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_config.t b/qa/t/test_config.t
index e2f82fc21c3958ae73aa1bdd7c1bc58a84373bda..ef1d8d89813dc4c0caef5429b0855492e008b805 100644 (file)
--- a/qa/t/test_config.t
+++ b/qa/t/test_config.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_create_user_accounts.t b/qa/t/test_create_user_accounts.t
index 5d647107371aaaa37821bd2ed28a44bb14954df8..050191a197e33aea673389c1a425e82ea72bb266 100644 (file)
--- a/qa/t/test_create_user_accounts.t
+++ b/qa/t/test_create_user_accounts.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_custom_fields.t b/qa/t/test_custom_fields.t
index 7c69e4bbfd441427c6675f117c08116f90b1d0ef..fa669b79e90841cc72592981201ff8ed87fde367 100644 (file)
--- a/qa/t/test_custom_fields.t
+++ b/qa/t/test_custom_fields.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_custom_fields_admin.t b/qa/t/test_custom_fields_admin.t
index cadb6c1578e596d2f422d0359d6f1a8f696c123e..81fcfe7cb41f7a93d4928cdf2a6f82affbac9658 100644 (file)
--- a/qa/t/test_custom_fields_admin.t
+++ b/qa/t/test_custom_fields_admin.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_default_groups.t b/qa/t/test_default_groups.t
index 974898dac1feb8681edb346a9cd44072f93e4e9d..b163e22221726a96ba7363940908a03da0218f1b 100644 (file)
--- a/qa/t/test_default_groups.t
+++ b/qa/t/test_default_groups.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_dependencies.t b/qa/t/test_dependencies.t
index f842b5fcd601d3c78d4490ede8f8eb016425117a..c054a4d0883a47cfb28bb5e2676b3a6892ee359a 100644 (file)
--- a/qa/t/test_dependencies.t
+++ b/qa/t/test_dependencies.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_edit_products_properties.t b/qa/t/test_edit_products_properties.t
index 417fa4be6ef6b7a763ab31abc3917a6a2596d76f..b62e7106135f0458848261c31126a1de998d4897 100644 (file)
--- a/qa/t/test_edit_products_properties.t
+++ b/qa/t/test_edit_products_properties.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_enter_new_bug.t b/qa/t/test_enter_new_bug.t
index b7ac92461b85484b0372d479211d1e6ebb69d7a4..ae527b32a88356fa141879f0dda38530fea425e7 100644 (file)
--- a/qa/t/test_enter_new_bug.t
+++ b/qa/t/test_enter_new_bug.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_flags.t b/qa/t/test_flags.t
index 0f7c950f74297f3a6702f6c90b876a3acb801835..8b7883bb5da3354342a67e784cdaf1f0414445cb 100644 (file)
--- a/qa/t/test_flags.t
+++ b/qa/t/test_flags.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_flags2.t b/qa/t/test_flags2.t
index 9706af63999b8e2d7cb38b185c04cfa6d0ae0821..cec9ee6efc699b451e48e1aa1dccda5c11306479 100644 (file)
--- a/qa/t/test_flags2.t
+++ b/qa/t/test_flags2.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_groups.t b/qa/t/test_groups.t
index caf30fbaceacc33b9ee956303f9b2544803d777f..eab30125fa2573f5106b810d2f823452371cd14c 100644 (file)
--- a/qa/t/test_groups.t
+++ b/qa/t/test_groups.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_keywords.t b/qa/t/test_keywords.t
index 5789676b496bbbfd2f361c1cae41e1fd31a8d532..72a4f6049cae23fb55db63ee856c75d4b7daa9cf 100644 (file)
--- a/qa/t/test_keywords.t
+++ b/qa/t/test_keywords.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_login.t b/qa/t/test_login.t
index 2b66d6e3c8a5414e168fd3540ad263d8f1ab9668..45bf1408f5a2a8c87e819b7f1cfc275b9ed3ae01 100644 (file)
--- a/qa/t/test_login.t
+++ b/qa/t/test_login.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_long_list_redirection.t b/qa/t/test_long_list_redirection.t
index 4e3a8ba9714f92f74d17081a68d993153ede9e5b..2ee23f9a22b65e761f698cfbc3351bf89b449620 100644 (file)
--- a/qa/t/test_long_list_redirection.t
+++ b/qa/t/test_long_list_redirection.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More "no_plan";
 use QA::Util;
 

diff --git a/qa/t/test_milestones.t b/qa/t/test_milestones.t
index baf04d4027c13e4f820c0dbc8dd390ba6f9464fa..e55bd5ca422586f20d850df9b968b0da7014bc3d 100644 (file)
--- a/qa/t/test_milestones.t
+++ b/qa/t/test_milestones.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_password_complexity.t b/qa/t/test_password_complexity.t
index 5d358864b1ee2ae0f1da312015a28eae6cb42b08..97b440ddde356251b669cd9db41d3feb946f766b 100644 (file)
--- a/qa/t/test_password_complexity.t
+++ b/qa/t/test_password_complexity.t
@@ -8,9 +8,7 @@
 use 5.10.1;
 use strict;
 use warnings;
-
-use FindBin qw($RealBin);
-use lib "$RealBin/lib", "$RealBin/../../lib", "$RealBin/../../local/lib/perl5";
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 use QA::Util;

diff --git a/qa/t/test_private_attachments.t b/qa/t/test_private_attachments.t
index 74b5adac929a3635cb6f480d73bc886a7bbe2caf..6126974d72ed343838cf7c27dd803b3fa0850910 100644 (file)
--- a/qa/t/test_private_attachments.t
+++ b/qa/t/test_private_attachments.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_qa_contact.t b/qa/t/test_qa_contact.t
index 66bcb74ab0cfa571248b38bc6f7726c2792d1175..b75044806ab31de2696a60385cce947aecf21ddf 100644 (file)
--- a/qa/t/test_qa_contact.t
+++ b/qa/t/test_qa_contact.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_require_login.t b/qa/t/test_require_login.t
index e4fd818912d4c706dce66649f1a164b3ecce735c..7b39e73295ef5c9f7585521c4d99b17ddfb162c4 100644 (file)
--- a/qa/t/test_require_login.t
+++ b/qa/t/test_require_login.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_sanity_check.t b/qa/t/test_sanity_check.t
index 84fc4d8c41e210964678686c3e92bfaec80a5082..06ab5735528a4d2deab2594a22f1b0c8d70a72d4 100644 (file)
--- a/qa/t/test_sanity_check.t
+++ b/qa/t/test_sanity_check.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_saved_searches.t b/qa/t/test_saved_searches.t
index b92307e600717d759cf8562e2d22733dfa44ab26..b5f47ff4a580d79ea63942edbc1cc40cf13dfe85 100644 (file)
--- a/qa/t/test_saved_searches.t
+++ b/qa/t/test_saved_searches.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_search.t b/qa/t/test_search.t
index b1f77aebf09e70a427337392c8d39342a422a2fe..780708a84e90060b8c368b6abadadb280d5ce3e1 100644 (file)
--- a/qa/t/test_search.t
+++ b/qa/t/test_search.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use Test::More "no_plan";
 

diff --git a/qa/t/test_security.t b/qa/t/test_security.t
index 7ff0152bee4b8e7367c8546f9dc21a8215a8386a..6d545ffd5c6de1fda8d8ca814c55d7efccffbb3e 100644 (file)
--- a/qa/t/test_security.t
+++ b/qa/t/test_security.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_shared_searches.t b/qa/t/test_shared_searches.t
index 6b38a271b7bfd9e5c8b833ce9639292025b92a0c..edae86decf4917f006ae7e8c18104be30a280baf 100644 (file)
--- a/qa/t/test_shared_searches.t
+++ b/qa/t/test_shared_searches.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_show_all_products.t b/qa/t/test_show_all_products.t
index 97d91517462bae75843f7e006523a5f14fd2151a..36f61e42cccb804e3636201cebf28eecb11b043c 100644 (file)
--- a/qa/t/test_show_all_products.t
+++ b/qa/t/test_show_all_products.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_shutdown.t b/qa/t/test_shutdown.t
index be562ad241613b164ca5c806754769f411bac7ec..33b9b426be9d5dc691a8b9af8f7d5f61076080c8 100644 (file)
--- a/qa/t/test_shutdown.t
+++ b/qa/t/test_shutdown.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_status_whiteboard.t b/qa/t/test_status_whiteboard.t
index 6c7f7b085a03bb97ca7006b8a9fda69d7b98f836..94582dd54f373401d6d45f884883f05dd4bcce89 100644 (file)
--- a/qa/t/test_status_whiteboard.t
+++ b/qa/t/test_status_whiteboard.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_sudo_sessions.t b/qa/t/test_sudo_sessions.t
index fb2b52a40476cf19566abef8c386949c2fae120b..9ef93c32db9347ca873d3fd03aef98211df34dd7 100644 (file)
--- a/qa/t/test_sudo_sessions.t
+++ b/qa/t/test_sudo_sessions.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_target_milestones.t b/qa/t/test_target_milestones.t
index f02eb42d722df2381197b1c9e62185bb275e948e..6aa211428ba81f7f1a47112781a11f34064f530b 100644 (file)
--- a/qa/t/test_target_milestones.t
+++ b/qa/t/test_target_milestones.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_time_summary.t b/qa/t/test_time_summary.t
index 0ae2ea5da9a6cb3d5de44b29e3f5b738f6a14e3d..504c864f2d7d91a80b85a63091cbc5975f473bf3 100644 (file)
--- a/qa/t/test_time_summary.t
+++ b/qa/t/test_time_summary.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_user_groups.t b/qa/t/test_user_groups.t
index 654f8dad6138a0d948a9c15afec9c5675e221757..89fc2fd6d98861049034866450a2510bc091708d 100644 (file)
--- a/qa/t/test_user_groups.t
+++ b/qa/t/test_user_groups.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_user_matching.t b/qa/t/test_user_matching.t
index 0326b87704ad3eb4bfe6a5b237c17a56b215028d..3b7b71ed5290dccba6d3d1a75fc75b157ccd4754 100644 (file)
--- a/qa/t/test_user_matching.t
+++ b/qa/t/test_user_matching.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_user_preferences.t b/qa/t/test_user_preferences.t
index ec5fa8187971407bd3c4f872954d3dad929315d5..d9e0562c1faeb0c1c8fc20756775fec1640bc5bf 100644 (file)
--- a/qa/t/test_user_preferences.t
+++ b/qa/t/test_user_preferences.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_user_privs.t b/qa/t/test_user_privs.t
index 367049bc76ca4472eca3cb5b6be13bc14f4b59fd..72b205b25a6fbffbab04b6570d69184d299ffd51 100644 (file)
--- a/qa/t/test_user_privs.t
+++ b/qa/t/test_user_privs.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/test_votes.t b/qa/t/test_votes.t
index b36491b607b85018032f30e79983f1efa86a08bd..ee257e85c8b45c38f4fa75001a4c5f6f818ef7ac 100644 (file)
--- a/qa/t/test_votes.t
+++ b/qa/t/test_votes.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 

diff --git a/qa/t/webservice_bug_add_attachment.t b/qa/t/webservice_bug_add_attachment.t
index 1ea0ca76a8a55b5e8c661a09304cee0f297ac2a3..e2dad94c350421112624f2dc1cb7b0c528db822b 100644 (file)
--- a/qa/t/webservice_bug_add_attachment.t
+++ b/qa/t/webservice_bug_add_attachment.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use MIME::Base64 qw(encode_base64 decode_base64);
 use Test::More tests => 187;

diff --git a/qa/t/webservice_bug_add_comment.t b/qa/t/webservice_bug_add_comment.t
index 64c410f3f26c95154bc860bff9fb4eb138d19391..cf0310602b15317d1823a7a87c678b2bd9b3e34b 100644 (file)
--- a/qa/t/webservice_bug_add_comment.t
+++ b/qa/t/webservice_bug_add_comment.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use Test::More tests => 141;
 my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();

diff --git a/qa/t/webservice_bug_attachments.t b/qa/t/webservice_bug_attachments.t
index da63ddd27fe6c45baef419142a882da3bd0246e9..daa5032a352ea3ac4598c299748a339b71fa9cc7 100644 (file)
--- a/qa/t/webservice_bug_attachments.t
+++ b/qa/t/webservice_bug_attachments.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(STANDARD_BUG_TESTS PRIVATE_BUG_USER);
 use Data::Dumper;

diff --git a/qa/t/webservice_bug_comments.t b/qa/t/webservice_bug_comments.t
index df583c8ce5d1e4b14cc01ab2422d85ce9a852006..ccc0c6d34291afb19aca82f2e13729130060f1f5 100644 (file)
--- a/qa/t/webservice_bug_comments.t
+++ b/qa/t/webservice_bug_comments.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use DateTime;
 use QA::Util;
 use QA::Tests qw(STANDARD_BUG_TESTS PRIVATE_BUG_USER);

diff --git a/qa/t/webservice_bug_create.t b/qa/t/webservice_bug_create.t
index 640a714be0717c0d5bf8f604275960537a518b6a..8bab088af566e591a39045e748f879410f6f8091 100644 (file)
--- a/qa/t/webservice_bug_create.t
+++ b/qa/t/webservice_bug_create.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Storable qw(dclone);
 use Test::More tests => 293;
 use QA::Util;

diff --git a/qa/t/webservice_bug_fields.t b/qa/t/webservice_bug_fields.t
index d72b25170846bbb6f97d2b24d2bd6d454f942bbe..be565521feb5304bf1974a46a8f44c031753d5ca 100644 (file)
--- a/qa/t/webservice_bug_fields.t
+++ b/qa/t/webservice_bug_fields.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use Test::More;
 use List::Util qw(first);

diff --git a/qa/t/webservice_bug_get.t b/qa/t/webservice_bug_get.t
index a68f928994fb92605ecdce4bd8eb4031130316d3..88cc429894a8f5efffa99c12c64ad8aed389a55d 100644 (file)
--- a/qa/t/webservice_bug_get.t
+++ b/qa/t/webservice_bug_get.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use DateTime;
 use QA::Util;

diff --git a/qa/t/webservice_bug_get_bugs.t b/qa/t/webservice_bug_get_bugs.t
index d8386135053e381578f90b66f538f7dc275ee773..d66249b2c575c32120e7ea4c1d27a213993e5ee2 100644 (file)
--- a/qa/t/webservice_bug_get_bugs.t
+++ b/qa/t/webservice_bug_get_bugs.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use DateTime;
 use QA::Util;

diff --git a/qa/t/webservice_bug_history.t b/qa/t/webservice_bug_history.t
index 3153834fa5a508bd7555e47f5c54839e227a41c0..7451fe450476db7d3c50d257788e262bcbed31fd 100644 (file)
--- a/qa/t/webservice_bug_history.t
+++ b/qa/t/webservice_bug_history.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(STANDARD_BUG_TESTS);
 use Test::More tests => 114;

diff --git a/qa/t/webservice_bug_legal_values.t b/qa/t/webservice_bug_legal_values.t
index 8e1b039a31d0851672a08aa318e299c45481309a..29f444708cedcd7e8b7ea5e2f4107cd6c3e1aaea 100644 (file)
--- a/qa/t/webservice_bug_legal_values.t
+++ b/qa/t/webservice_bug_legal_values.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 269;
 use QA::Util;
 my ($config, @clients) = get_rpc_clients();

diff --git a/qa/t/webservice_bug_search.t b/qa/t/webservice_bug_search.t
index 0a4dcd6666b92edbf0fc2683942edb6605324182..6a4933c5a380084d76bce31bbafc92e19100d363 100644 (file)
--- a/qa/t/webservice_bug_search.t
+++ b/qa/t/webservice_bug_search.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER);
 use DateTime;

diff --git a/qa/t/webservice_bug_update.t b/qa/t/webservice_bug_update.t
index 8ca59cfa78c533ec0eae230374f692f5f9c066b8..097c506b62305911e6b0f696750e1ea895fb6f79 100644 (file)
--- a/qa/t/webservice_bug_update.t
+++ b/qa/t/webservice_bug_update.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS);

diff --git a/qa/t/webservice_bug_update_see_also.t b/qa/t/webservice_bug_update_see_also.t
index 3bdc3dc25e0bb8f55ab3d0e1a9f8bae769028856..fc6c9bc9ecdba4abc3c0fd77f192bb5b6676fbe9 100644 (file)
--- a/qa/t/webservice_bug_update_see_also.t
+++ b/qa/t/webservice_bug_update_see_also.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS);
 use Test::More tests => 117;

diff --git a/qa/t/webservice_bugzilla.t b/qa/t/webservice_bugzilla.t
index fef57cca1a651af4a8292790097c635f6f409316..6d40e308877de5b795a51fb5546d6b6b3eb31d23 100644 (file)
--- a/qa/t/webservice_bugzilla.t
+++ b/qa/t/webservice_bugzilla.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 11 * 3;
 use QA::Util;
 my ($config, @clients) = get_rpc_clients();

diff --git a/qa/t/webservice_group_create.t b/qa/t/webservice_group_create.t
index 346800b0ede6c7192df59e7b9e48c69fe88183bc..9ddf43d865d78b35b3f4a1b073adb5c22b6d4351 100644 (file)
--- a/qa/t/webservice_group_create.t
+++ b/qa/t/webservice_group_create.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 77;
 use QA::Util;
 

diff --git a/qa/t/webservice_jsonp.t b/qa/t/webservice_jsonp.t
index dd62b63926f569ed929001f7f2b45a4bf5d6d406..53b23aaf20e141577d0b266c213a06ea1e03bdd0 100644 (file)
--- a/qa/t/webservice_jsonp.t
+++ b/qa/t/webservice_jsonp.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 85;
 use QA::Util;
 my $jsonrpc_get = QA::Util::get_jsonrpc_client('GET');

diff --git a/qa/t/webservice_product.t b/qa/t/webservice_product.t
index 7f993899f3fcedac900eb4c981cc935cceea741e..1ced652765e1d6c749d718ca5c8adb01e4ccf8ba 100644 (file)
--- a/qa/t/webservice_product.t
+++ b/qa/t/webservice_product.t
@@ -15,7 +15,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 134;
 use QA::Util;
 my ($config, @clients) = get_rpc_clients();

diff --git a/qa/t/webservice_product_create.t b/qa/t/webservice_product_create.t
index 05b82d60ce055610496039d2fb472884010c0961..3b8fe78b1758e2cf646c60d2ab5ca58075c971c6 100644 (file)
--- a/qa/t/webservice_product_create.t
+++ b/qa/t/webservice_product_create.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 121;
 use QA::Util;
 

diff --git a/qa/t/webservice_product_get.t b/qa/t/webservice_product_get.t
index 0128f334823c7b3f330ed747cdcb19605a1c1deb..7f445ced7ddc9fdd5abbf51b93f5eb9fbf2df051 100644 (file)
--- a/qa/t/webservice_product_get.t
+++ b/qa/t/webservice_product_get.t
@@ -15,7 +15,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 134;
 use QA::Util;
 my ($config, @clients) = get_rpc_clients();

diff --git a/qa/t/webservice_user_create.t b/qa/t/webservice_user_create.t
index 551de99777f9cb11da9bd0bb46ba496d3d19c0d7..f82e71ae491ce1424082b8fad215ccec048dfe2a 100644 (file)
--- a/qa/t/webservice_user_create.t
+++ b/qa/t/webservice_user_create.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use Test::More tests => 75;
 my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();

diff --git a/qa/t/webservice_user_get.t b/qa/t/webservice_user_get.t
index 7d50bf22eb0a4e188c290e9fc3e5253bf8f42bee..4a7f74f7823b40810a51bdf9ef8f4ef61228751f 100644 (file)
--- a/qa/t/webservice_user_get.t
+++ b/qa/t/webservice_user_get.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER);
 use Test::More tests => 330;

diff --git a/qa/t/webservice_user_login_logout.t b/qa/t/webservice_user_login_logout.t
index 2affb961caf6e8a7d4c70fcab4344d838f6c02d3..a6abec88e857cce25689283d86e886fc81c2dda7 100644 (file)
--- a/qa/t/webservice_user_login_logout.t
+++ b/qa/t/webservice_user_login_logout.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use QA::Util;
 use Test::More tests => 119;

diff --git a/qa/t/webservice_user_offer_account_by_email.t b/qa/t/webservice_user_offer_account_by_email.t
index ae311afb83f7042fc8a351ea34581ea53abc5e31..e9392bab5b9dcae78c86fb30f64603e86098ad3d 100644 (file)
--- a/qa/t/webservice_user_offer_account_by_email.t
+++ b/qa/t/webservice_user_offer_account_by_email.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use Test::More tests => 29;
 my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();

diff --git a/scripts/1298978.pl b/scripts/1298978.pl
index c4ae39f076f1abc356122ee1f24f29e10dada956..9320e080ee9bc3fd90920a495a07e2e1dc2a075f 100755 (executable)
--- a/scripts/1298978.pl
+++ b/scripts/1298978.pl
@@ -9,9 +9,8 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin '$RealBin';
-use lib "$RealBin/../..", "$RealBin/../../lib";
 
 use Bugzilla;
 use Bugzilla::Bug;

diff --git a/scripts/addcustomfield.pl b/scripts/addcustomfield.pl
index 6e128ab6fa63b96fbe1ea5b71b4d9a51a5e6fea8..a9bd2bcb3737d7a5e87a0fa1c3023993d2018ee0 100755 (executable)
--- a/scripts/addcustomfield.pl
+++ b/scripts/addcustomfield.pl
@@ -16,9 +16,11 @@
 # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
 #                 David Miller <justdave@mozilla.com>
 
+use 5.10.1;
 use strict;
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use warnings;
+use lib qw(. lib local/lib/perl5);
+
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/clear-memcached.pl b/scripts/clear-memcached.pl
index 0ce97e7a089d4bcc065bf8f37be4e0ca1a0426c0..bbf8f1ccad6dde7ef153b4bbb520a2f1c094f476 100755 (executable)
--- a/scripts/clear-memcached.pl
+++ b/scripts/clear-memcached.pl
@@ -9,9 +9,10 @@
 
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/clear-templates.pl b/scripts/clear-templates.pl
index 81c85646b71512d81bee902e0f4e9367204c5670..9deb2e47d97c359dfef52f04e5bee093a8d435c0 100755 (executable)
--- a/scripts/clear-templates.pl
+++ b/scripts/clear-templates.pl
@@ -9,8 +9,9 @@
 
 use strict;
 use warnings;
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
+
+
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/close_bugs_wontfix.pl b/scripts/close_bugs_wontfix.pl
index e0bd5351bb777c666ae0277e3040b33fc814c28f..1c80a965dbdefc6423bb9c673076c3b8e2da9889 100755 (executable)
--- a/scripts/close_bugs_wontfix.pl
+++ b/scripts/close_bugs_wontfix.pl
@@ -9,9 +9,8 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Bug;

diff --git a/scripts/convert_datetime.pl b/scripts/convert_datetime.pl
index b6b71546c0838bbe9065fb9694a2d3d3f350e129..279eb84b8310203734df53dd11fbea091c553099 100755 (executable)
--- a/scripts/convert_datetime.pl
+++ b/scripts/convert_datetime.pl
@@ -9,9 +9,10 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/cpanfile_fixed_versions.pl b/scripts/cpanfile_fixed_versions.pl
index 680e8ece325cf7a443b00ba0a32a4f085de0e44b..dd2fc0a0c6c6b37996e3299bb26191f50a3f7ddf 100755 (executable)
--- a/scripts/cpanfile_fixed_versions.pl
+++ b/scripts/cpanfile_fixed_versions.pl
@@ -9,9 +9,10 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;

diff --git a/scripts/eject-users-from-groups.pl b/scripts/eject-users-from-groups.pl
index c67238705e183a5e6cc631c634080097f0fef447..52e2bbbf3bf8a255f0e5e8161a71663726827590 100644 (file)
--- a/scripts/eject-users-from-groups.pl
+++ b/scripts/eject-users-from-groups.pl
@@ -8,9 +8,10 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 use Getopt::Long;
 
 use Bugzilla;

diff --git a/scripts/fix-attachment-sizes.pl b/scripts/fix-attachment-sizes.pl
index 328c0595eaed3da792d8beb91cef1fb73b3ba087..6c5a3a39cc6633ecf15f452462363c3f6fd16ed8 100755 (executable)
--- a/scripts/fix-attachment-sizes.pl
+++ b/scripts/fix-attachment-sizes.pl
@@ -7,11 +7,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
 use strict;
-use feature 'say';
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/fix_all_open_status_queries.pl b/scripts/fix_all_open_status_queries.pl
index da40cb14088579388e12517eb2bd91fe05e8b63d..1ba7c66c66363f89a5d67a6baf7c0449d7ec7c62 100755 (executable)
--- a/scripts/fix_all_open_status_queries.pl
+++ b/scripts/fix_all_open_status_queries.pl
@@ -6,10 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
 use strict;
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/fixgroupqueries.pl b/scripts/fixgroupqueries.pl
index 1934561dfe5e8c6b83cd8c3a6cf953ca32caff2c..23d86268d94ebbe6ca627648ff75af00432557bd 100755 (executable)
--- a/scripts/fixgroupqueries.pl
+++ b/scripts/fixgroupqueries.pl
@@ -20,10 +20,10 @@
 #
 # Contributor(s): Gervase Markham <gerv@gerv.net>
 
+use 5.10.1;
 use strict;
-
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/fixperms.pl b/scripts/fixperms.pl
index f470eabe6c1e053a6727788a33ce70092a0c9cc8..43b11af081d85e391ef602f521918191589bbb92 100755 (executable)
--- a/scripts/fixperms.pl
+++ b/scripts/fixperms.pl
@@ -21,8 +21,9 @@
 
 use strict;
 use warnings;
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
+
+
 
 use Bugzilla;
 use Bugzilla::Install::Filesystem qw(fix_all_file_permissions);

diff --git a/scripts/fixqueries.pl b/scripts/fixqueries.pl
index 2619081ce3694d933b340545a7fb4616070b4ce5..c26165160f7ac02c25c1b4c9db221bdbe6f9ac12 100755 (executable)
--- a/scripts/fixqueries.pl
+++ b/scripts/fixqueries.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public
@@ -20,10 +20,10 @@
 #
 # Contributor(s): Gervase Markham <gerv@gerv.net>
 
+use 5.10.1;
 use strict;
-
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/generate_bmo_data.pl b/scripts/generate_bmo_data.pl
index 541dc805348b443fd9a17b20b610ff05274d08ad..485ad5398b4d365de865c853a622b80c055f3175 100755 (executable)
--- a/scripts/generate_bmo_data.pl
+++ b/scripts/generate_bmo_data.pl
@@ -5,8 +5,9 @@
 
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
 
-use lib qw(. local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::User;

diff --git a/scripts/group-set-members.pl b/scripts/group-set-members.pl
index 10955b00d2ca103f614894abe4ca37aeb16275d7..0ec9aeddabe344613876597ba106ee9136ceb1c4 100755 (executable)
--- a/scripts/group-set-members.pl
+++ b/scripts/group-set-members.pl
@@ -9,10 +9,9 @@
 
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 use feature 'say';
-use FindBin;
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/issue-api-key.pl b/scripts/issue-api-key.pl
index 3e4b2c000d45d01cf559884829b5862277815963..810b7e17e4683147508bf9eeaaeaa051ad13cebd 100755 (executable)
--- a/scripts/issue-api-key.pl
+++ b/scripts/issue-api-key.pl
@@ -7,11 +7,10 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
 use strict;
-use feature 'say';
-
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/merge-users.pl b/scripts/merge-users.pl
index d2b8196b50ba447ed610d71da0c77c43ede60187..2d9c795d78cf0d563914837a428d0afc68e45927 100755 (executable)
--- a/scripts/merge-users.pl
+++ b/scripts/merge-users.pl
@@ -9,6 +9,7 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 
 =head1 NAME
 
@@ -31,7 +32,7 @@ merge-users.pl - Merge two user accounts.
 
 =cut
 
-use lib qw(. lib local/lib/perl5);
+
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/migrate-attachments.pl b/scripts/migrate-attachments.pl
index b514f1620f5a6be8c3e9c6b3b38be95a051cc459..dee1e7a3b97cdee3c8cc6a6692514507a1100e9c 100755 (executable)
--- a/scripts/migrate-attachments.pl
+++ b/scripts/migrate-attachments.pl
@@ -9,10 +9,11 @@
 
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 $| = 1;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+
+
 
 use Bugzilla;
 use Bugzilla::Attachment;

diff --git a/scripts/migrate-cab-review.pl b/scripts/migrate-cab-review.pl
index aa30c518f233c303fd3dde26697ec3fd990d0203..b4665f2556f50391a370d6e19a12cde7bc37a880 100755 (executable)
--- a/scripts/migrate-cab-review.pl
+++ b/scripts/migrate-cab-review.pl
@@ -9,9 +9,10 @@
 
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Bug;

diff --git a/scripts/migrate_whiteboard_keyword.pl b/scripts/migrate_whiteboard_keyword.pl
index f31a30521e2a4ab5ba206984c6e01f48bb200cb8..a1bbf6152649b00aefbe9b7f86948c2e925f9aa4 100644 (file)
--- a/scripts/migrate_whiteboard_keyword.pl
+++ b/scripts/migrate_whiteboard_keyword.pl
@@ -31,9 +31,8 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/move_flag_types.pl b/scripts/move_flag_types.pl
index bf0bf0ecad8684089838e55e9d03c7d31e10f786..d4aa6cb0910392aeefab82b9838d8542f309623a 100755 (executable)
--- a/scripts/move_flag_types.pl
+++ b/scripts/move_flag_types.pl
@@ -81,9 +81,7 @@ Without this argument, changes are not actually committed to the database.
 
 use strict;
 use warnings;
-
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Getopt::Long;

diff --git a/scripts/move_os.pl b/scripts/move_os.pl
index 48f6d0031c61aaa5ae4bd497374b5a3e2c51eaf8..546b47c7eca440e415f73a12600396f758364893 100755 (executable)
--- a/scripts/move_os.pl
+++ b/scripts/move_os.pl
@@ -9,9 +9,10 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Field;

diff --git a/scripts/movebugs.pl b/scripts/movebugs.pl
index 45f329ad2813c2ad6a7461afdcc3eb82a0a5c26c..2c643cdfb1f16a939089dbedf73f3d860a22ca45 100755 (executable)
--- a/scripts/movebugs.pl
+++ b/scripts/movebugs.pl
@@ -8,12 +8,12 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 use strict;
+use warnings;
+use lib qw(. lib local/lib/perl5);
+
 
 use Cwd 'abs_path';
 use File::Basename;
-use FindBin;
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/movecomponent.pl b/scripts/movecomponent.pl
index 10fa956c467b7e45d508ef4257153752d213af65..c558808fcb096dfdfcd82d6647eabb8662c814d6 100755 (executable)
--- a/scripts/movecomponent.pl
+++ b/scripts/movecomponent.pl
@@ -6,10 +6,10 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
 use strict;
-
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Component;

diff --git a/scripts/nagios_blocker_checker.pl b/scripts/nagios_blocker_checker.pl
index a6c5e5d7baf4040fd7727e9584c0e34643e02f5b..27947f03d909f348c4f881cc206563597f06840b 100755 (executable)
--- a/scripts/nagios_blocker_checker.pl
+++ b/scripts/nagios_blocker_checker.pl
@@ -9,9 +9,8 @@
 
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/nagios_push_checker.pl b/scripts/nagios_push_checker.pl
index 1fa28bf1d610936179c21d69c76c8726bdd7104e..ef350c3e119ebca2a9cd3273210dfb2f45a092e8 100755 (executable)
--- a/scripts/nagios_push_checker.pl
+++ b/scripts/nagios_push_checker.pl
@@ -9,9 +9,10 @@
 
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/nuke-bugs.pl b/scripts/nuke-bugs.pl
index 35774ff8d0bd8c24cbe64303f75bd8419ff4a61f..6faf7d69454572e127923f03ebcd34164d6b17d7 100755 (executable)
--- a/scripts/nuke-bugs.pl
+++ b/scripts/nuke-bugs.pl
@@ -6,10 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
 use strict;
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/reassign_open_bugs.pl b/scripts/reassign_open_bugs.pl
index 343a996174ced9c077026029798fc0a8e7842ab4..d0f107c166484461a82aa96b7de866763a59894c 100755 (executable)
--- a/scripts/reassign_open_bugs.pl
+++ b/scripts/reassign_open_bugs.pl
@@ -9,9 +9,10 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::User;

diff --git a/scripts/remove-non-public-data.pl b/scripts/remove-non-public-data.pl
index 8b5d2b2e71a0a7cd4e8467cb214dba444ce89b5e..fd379af79a54f823aa85e0df489256219c2675f2 100755 (executable)
--- a/scripts/remove-non-public-data.pl
+++ b/scripts/remove-non-public-data.pl
@@ -6,10 +6,10 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
 use strict;
-
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/remove_idle_group_members.pl b/scripts/remove_idle_group_members.pl
index 510d0623b06f882968cef13335b8a4c14414b9c1..407a8e6dc85eac95e54477644cfc94e786836182 100755 (executable)
--- a/scripts/remove_idle_group_members.pl
+++ b/scripts/remove_idle_group_members.pl
@@ -9,9 +9,8 @@
 
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }

diff --git a/scripts/reset_default_user.pl b/scripts/reset_default_user.pl
index 2888df48cbe08d84792ea1ea6ecaf89066952cf8..d0d2534f2002e48f4f7f9af96d300fcc1b8bdb9a 100755 (executable)
--- a/scripts/reset_default_user.pl
+++ b/scripts/reset_default_user.pl
@@ -6,10 +6,10 @@
 # This Source Code Form is "Incompatible With Secondary Licenses",  as
 # defined by the Mozilla Public License,  v. 2.0.
 
+use 5.10.1;
 use strict;
-
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/sanitizeme.pl b/scripts/sanitizeme.pl
index 8f241de343b91948670546bc2d6b796435a7dfee..0fc2d74d93e38129069e14fa8dab38794bd8787c 100755 (executable)
--- a/scripts/sanitizeme.pl
+++ b/scripts/sanitizeme.pl
@@ -23,9 +23,9 @@
 #                 Byron Jones <glob@mozilla.com>
 
 use strict;
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Bug;

diff --git a/scripts/security_remove.pl b/scripts/security_remove.pl
index 7c01e80021a54a318c2eed959f53d3763fec4dc1..dc0847e3c59ff1fbef7920ab5a0321e356cf8842 100755 (executable)
--- a/scripts/security_remove.pl
+++ b/scripts/security_remove.pl
@@ -9,9 +9,10 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/sendunsentbugmail.pl b/scripts/sendunsentbugmail.pl
index 3dae4a3413499004023be0b35417daee93878bdc..a8e1ed4dcf8cd51b3e674664f1d432de336cf84e 100755 (executable)
--- a/scripts/sendunsentbugmail.pl
+++ b/scripts/sendunsentbugmail.pl
@@ -9,9 +9,10 @@
 use 5.10.1;
 use strict;
 use warnings;
-
 use lib qw(. lib local/lib/perl5);
 
+
+
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::BugMail;

diff --git a/scripts/syncflags.pl b/scripts/syncflags.pl
index 7250cdf89894b229ca153fdfe4d24fcf35fbccaf..e6b521e626f6cbf665f5be8c570b4b3839942adb 100755 (executable)
--- a/scripts/syncflags.pl
+++ b/scripts/syncflags.pl
@@ -22,10 +22,11 @@
 
 # See also https://bugzilla.mozilla.org/show_bug.cgi?id=119569
 
+use 5.10.1;
 use strict;
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/syncmsandversions.pl b/scripts/syncmsandversions.pl
index e886d9e5bc05918b7f34da709ccd30cdce85188a..509a78cc85ea93f95bac036c489d5be890dd5be6 100755 (executable)
--- a/scripts/syncmsandversions.pl
+++ b/scripts/syncmsandversions.pl
@@ -23,9 +23,9 @@
 # See also https://bugzilla.mozilla.org/show_bug.cgi?id=119569
 
 use strict;
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/scripts/test b/scripts/test
new file mode 100644 (file)
index 0000000..64e7ee9
--- /dev/null
+++ b/scripts/test
@@ -0,0 +1,35 @@
+find . \
+         -not -name security_remove.pl  \
+         -not -name close_bugs_wontfix.pl \
+         -not -name fix-attachment-sizes.pl \
+         -not -name sanitizeme.pl \
+         -not -name nuke-bugs.pl \
+         -not -name fix_all_open_status_queries.pl \
+         -not -name addcustomfield.pl \
+         -not -name merge-users.pl \
+         -not -name migrate_whiteboard_keyword.pl \
+         -not -name syncflags.pl \
+         -not -name nagios_blocker_checker.pl \
+         -not -name 1298978.pl \
+         -not -name group-set-members.pl \
+         -not -name update-bug-groups.pl \
+         -not -name sendunsentbugmail.pl \
+         -not -name remove_idle_group_members.pl \
+         -not -name movebugs.pl \
+         -not -name syncmsandversions.pl \
+         -not -name move_flag_types.pl \
+         -not -name migrate-cab-review.pl \
+         -not -name migrate-attachments.pl \
+         -not -name triage_owners_csv.pl \
+         -not -name move_os.pl \
+         -not -name reassign_open_bugs.pl \
+         -not -name generate_bmo_data.pl \
+         -not -name user-prefs.pl \
+         -not -name clear-templates.pl \
+         -not -name fixperms.pl \
+         -not -name nagios_push_checker.pl \
+         -not -name clear-memcached.pl \
+         -not -name eject-users-from-groups.pl \
+         -not -name cpanfile_fixed_versions.pl \
+         -not -name convert_datetime.pl \
+         -not -name update-crash-signatures.pl

diff --git a/scripts/triage_owners_csv.pl b/scripts/triage_owners_csv.pl
index 214b7b04f79fb9dfa6df01f86d86409b63f44d46..e3feeee0fbbf0fadf61292099f073a983411d87b 100644 (file)
--- a/scripts/triage_owners_csv.pl
+++ b/scripts/triage_owners_csv.pl
@@ -9,9 +9,10 @@
 use 5.10.1;
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
+
+
 
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Component;

diff --git a/scripts/update-bug-groups.pl b/scripts/update-bug-groups.pl
index 0aed32e9b5065aa82091ff86a8cca92b63205f54..ef82f0ad637b7b2a6e4f7769377f9ada23dee474 100755 (executable)
--- a/scripts/update-bug-groups.pl
+++ b/scripts/update-bug-groups.pl
@@ -9,10 +9,10 @@
 
 use strict;
 use warnings;
-$| = 1;
+use lib qw(. lib local/lib/perl5);
+
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+$| = 1;
 
 use Bugzilla;
 use Bugzilla::CGI;

diff --git a/scripts/update-crash-signatures.pl b/scripts/update-crash-signatures.pl
index f8efca7ff633f83b2d6122652255e3c89939cbde..292427955e2b0078c212b5e112b64a9cd12e24c2 100755 (executable)
--- a/scripts/update-crash-signatures.pl
+++ b/scripts/update-crash-signatures.pl
@@ -9,10 +9,11 @@
 
 use strict;
 use warnings;
+use lib qw(. lib local/lib/perl5);
 $| = 1;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+
+
 
 use constant BATCH_SIZE => 100;
 

diff --git a/scripts/user-prefs.pl b/scripts/user-prefs.pl
index b7c860f484bd43ceb1f8c44bbaea7198ce293dc9..dc44c5aeadaa43e40a3e520959dc80c3a3798b08 100755 (executable)
--- a/scripts/user-prefs.pl
+++ b/scripts/user-prefs.pl
@@ -7,11 +7,10 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use strict;
 use 5.10.1;
-
-use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
+use strict;
+use warnings;
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;

diff --git a/sentry.pl b/sentry.pl
index 8d8b878e9323ae183584487f764486affb59bcb6..ebb221cfda8a43c0329f85db56067b651421eec3 100755 (executable)
--- a/sentry.pl
+++ b/sentry.pl
@@ -16,10 +16,7 @@
 use 5.10.1;
 use strict;
 use warnings;
-
-# exit early if there's nothing to send
-use FindBin qw($RealBin);
-use lib ("$RealBin/.", "$RealBin/lib", "$RealBin/local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     delete $ENV{SERVER_SOFTWARE};