PERLLIB, @INC: Use BEGIN { }

unshifting @INC is only effective if done at compile time, so that it
affects `use' directives.  So "Perl: Put . on @INC"
f261b07cbe96844dba5d8594c38149c0b179068a is simply broken

This patch was autogenerated using the following rune:

  git-grep -l 'unshift @INC' | xargs perl -i~ -pe 's#\bunshift\s+\@INC,\s*qw\(\.\)\;#BEGIN { $& }#'

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/adhoc-revtuple-generator b/adhoc-revtuple-generator
index 39fc523cd4c210bee7c3cb93440ab8eb1a67e06d..1e047739de7823f7cef63b5b9f689e2b2ed0a692 100755 (executable)
--- a/adhoc-revtuple-generator
+++ b/adhoc-revtuple-generator
@@ -23,7 +23,7 @@ use IO::Handle;
 no warnings qw(recursion);
 use Data::Dumper;
 use POSIX;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::Executive;

diff --git a/cr-disk-report b/cr-disk-report
index a386ce43a4d3739afcf579dda69c50c9f3ffbbd7..543d35bfb73834066e43f4d22102cf74ae899a36 100755 (executable)
--- a/cr-disk-report
+++ b/cr-disk-report
@@ -21,7 +21,7 @@
 # usage: ./cr-disk-report [<options>] cfgbase
 
 use strict qw(vars);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::Management qw(:logs);
 

diff --git a/cr-ensure-disk-space b/cr-ensure-disk-space
index da5cd7cb5cc78f00f4af31e06a7ca96ed879d6d5..8d3d443951cc5cbf0f90b1bd89d60e1bfaf784b1 100755 (executable)
--- a/cr-ensure-disk-space
+++ b/cr-ensure-disk-space
@@ -21,7 +21,7 @@
 
 
 use strict qw(vars);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::Management qw(:logs);
 use Fcntl qw(:flock);

diff --git a/cr-publish-flight-logs b/cr-publish-flight-logs
index b3f4128906fb48c16908b5ff4b62e3397481c6ec..45545ce2140247443487fd522587b347bc0159cc 100755 (executable)
--- a/cr-publish-flight-logs
+++ b/cr-publish-flight-logs
@@ -19,7 +19,7 @@
 
 use strict qw(refs vars);
 use Fcntl qw(:flock);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 our %c;

diff --git a/cs-adjust-flight b/cs-adjust-flight
index 0be104ea282d6549467bc06d412eb0179f3b8376..f443cfd8a59fc58f2ccfcc5e156e410a4234d0fc 100755 (executable)
--- a/cs-adjust-flight
+++ b/cs-adjust-flight
@@ -64,7 +64,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Data::Dumper;
 

diff --git a/cs-bisection-step b/cs-bisection-step
index 13ccd7acc7d8b3cc592db96cbeb4d648d996c405..0be8bd0f014a57d3fc5db2dbd1cbc2d0db9fc926 100755 (executable)
--- a/cs-bisection-step
+++ b/cs-bisection-step
@@ -37,7 +37,7 @@
 
 
 use strict qw(vars);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Data::Dumper;
 no warnings qw(recursion);

diff --git a/cs-flight-bless b/cs-flight-bless
index 0494997e7ce119df2935d8e840c30ffe0311ba02..78dd9199f836fa0843ac5c4f7388a3a3a63452f2 100755 (executable)
--- a/cs-flight-bless
+++ b/cs-flight-bless
@@ -22,7 +22,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 csreadconfig();

diff --git a/cs-flight-create b/cs-flight-create
index dc61e621e359373e00efd7dbc68278c65d14f17a..71f1fda36bfafdebafac4dea5169bb4d315ad5ea 100755 (executable)
--- a/cs-flight-create
+++ b/cs-flight-create
@@ -19,7 +19,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 csreadconfig();

diff --git a/cs-hosts-list b/cs-hosts-list
index 306b04ea0d369b733b8031b68814fc43e2f0dfe5..6b910ae34741822a42a748dd8ddad87e79f4e35e 100755 (executable)
--- a/cs-hosts-list
+++ b/cs-hosts-list
@@ -61,7 +61,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 csreadconfig();

diff --git a/cs-job-create b/cs-job-create
index 85d576cdb42a71848b65d3cbb002e083fe17a8d8..064a92942ebd5bc903ab1af0879110efe6be7e23 100755 (executable)
--- a/cs-job-create
+++ b/cs-job-create
@@ -27,7 +27,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 csreadconfig();

diff --git a/determine-failure-reasons b/determine-failure-reasons
index 89c67e645612db185f88e822a1519e32cd5b19b0..cf40ca3b0ebb98fd255c8c898d1ffbf4858dd3a5 100755 (executable)
--- a/determine-failure-reasons
+++ b/determine-failure-reasons
@@ -20,7 +20,7 @@
 use strict qw(refs vars);
 
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use POSIX;
 

diff --git a/mg-allocate b/mg-allocate
index dadac3c15e61fe5ec3535286a7be96a8b24af5c1..c30dd1501b1fa352b8f149d3aec7965f18a79118 100755 (executable)
--- a/mg-allocate
+++ b/mg-allocate
@@ -81,7 +81,7 @@
 
 use strict qw(vars refs);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::Executive;

diff --git a/mg-blockage b/mg-blockage
index f0af91ef6ee90efa6cc22df6274642c306185c10..dbec6df50570f7e5f309658cdfab98a97098df9e 100755 (executable)
--- a/mg-blockage
+++ b/mg-blockage
@@ -5,7 +5,7 @@
 use strict qw(vars refs);
 use DBI;
 use Data::Dumper;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::Executive;

diff --git a/mg-db-activity-logger b/mg-db-activity-logger
index 8a389403638e122db88e21261294ee132362a1ac..eb4e741ffc6b32af89594fd0a11bd4c25fea61fa 100755 (executable)
--- a/mg-db-activity-logger
+++ b/mg-db-activity-logger
@@ -12,7 +12,7 @@ BEGIN {
 unshift @INC, "$`" if $0 =~ m#/[^/]+$#;
 }
 
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 our $dbname = 'osstestdb';

diff --git a/mg-db-activity-redactor b/mg-db-activity-redactor
index 2ab6cfe0ed432589376880351e52e27dfc347603..db40a1b2199a8401de368761b8067f7d14703013 100755 (executable)
--- a/mg-db-activity-redactor
+++ b/mg-db-activity-redactor
@@ -9,7 +9,7 @@ BEGIN {
 unshift @INC, "$`" if $0 =~ m#/[^/]+$#;
 }
 
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 our @tsforce;

diff --git a/mg-hosts b/mg-hosts
index 2ed42fc16e42bbe12e681a0e8497cebc9127e304..a000f2dc92f3f3c48085dd0fa4fa464838d69141 100755 (executable)
--- a/mg-hosts
+++ b/mg-hosts
@@ -92,7 +92,7 @@
 
 use strict qw(vars refs);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use File::Basename;

diff --git a/mg-queue-inhibit b/mg-queue-inhibit
index 93f254cfa2c9705596d2c43993e08e15bf3a5716..a0fcf01cc0393fd93b3781c7d46be465a52ea5c9 100755 (executable)
--- a/mg-queue-inhibit
+++ b/mg-queue-inhibit
@@ -19,7 +19,7 @@
 
 use strict qw(refs vars);
 
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::Executive;
 

diff --git a/mg-report-host-usage-collect b/mg-report-host-usage-collect
index 6a8cc689cd8df6461d1730cde3a78a8e567ce72d..160d295fc0624708d9f6405ae1da28f5b0f1f3eb 100755 (executable)
--- a/mg-report-host-usage-collect
+++ b/mg-report-host-usage-collect
@@ -20,7 +20,7 @@
 use strict qw(vars);
 
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use IO::Handle;
 use POSIX;

diff --git a/mg-schema-update b/mg-schema-update
index 44e42838bb405554b8909ab5c34a3f50744c078e..770d82abdfa9ea070871a49fffeb2b072bc171e9 100755 (executable)
--- a/mg-schema-update
+++ b/mg-schema-update
@@ -53,7 +53,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::Executive;
 

diff --git a/mg-show-flight-runvars b/mg-show-flight-runvars
index 7e8bd8edb45092a27bfd248fc2e589b454c19acc..8da85392357ddcddf9cf56f774296880f52641db 100755 (executable)
--- a/mg-show-flight-runvars
+++ b/mg-show-flight-runvars
@@ -21,7 +21,7 @@
 
 use strict qw(vars refs);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 csreadconfig();

diff --git a/ms-flights-summary b/ms-flights-summary
index 0e5cd4d7632c685474cd36e583692fddb01b382b..9d15dd145e451bf0983ce77ef59e00cc805b8d57 100755 (executable)
--- a/ms-flights-summary
+++ b/ms-flights-summary
@@ -2,7 +2,7 @@
 
 use strict qw(vars refs);
 
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::Executive;
 

diff --git a/ms-planner b/ms-planner
index c060b028a6581a4f420a3765d9a032c50831076d..af0c7463bed7d3654366baf26b8fae1aa154d4cd 100755 (executable)
--- a/ms-planner
+++ b/ms-planner
@@ -22,7 +22,7 @@
 
 use strict qw(vars refs);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use JSON;
 use POSIX;

diff --git a/ms-planner-debug b/ms-planner-debug
index acfbc22a6c993d965ee8e23c2461b916bdcf24ea..c82666d109de727f4fb4f37daf308bbe43bd92b9 100755 (executable)
--- a/ms-planner-debug
+++ b/ms-planner-debug
@@ -21,7 +21,7 @@ use strict qw(vars refs);
 use JSON;
 use Data::Dumper;
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 csreadconfig();

diff --git a/sg-check-tested b/sg-check-tested
index a0a2db702095d2e3c730b9fbbf6ea10f2c234dae..7946e4b56ed4c4304386e505563c53460d028b54 100755 (executable)
--- a/sg-check-tested
+++ b/sg-check-tested
@@ -19,7 +19,7 @@
 use strict;
 
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use IO::Handle;
 

diff --git a/sg-report-flight b/sg-report-flight
index e5f1bb9a3f22596dfce86638e4c4625469c520ba..dba36410c3f61aaaf9b142005d3b791e29e8d892 100755 (executable)
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -20,7 +20,7 @@
 use strict qw(refs vars);
 
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use IO::Handle;
 use HTML::Entities;

diff --git a/sg-report-host-history b/sg-report-host-history
index cb98ea0bc03773f98babf2094a9975fb4a6829e1..e86e03b98c3154d6885961275f52714d858bc969 100755 (executable)
--- a/sg-report-host-history
+++ b/sg-report-host-history
@@ -20,7 +20,7 @@
 use strict qw(vars);
 
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use IO::Handle;
 use HTML::Entities;

diff --git a/sg-report-job-history b/sg-report-job-history
index 111579366a703eedfa2cf027609634c042c568dc..d5f91ff1706af1948623e77b4a4b8b07a40fcf40 100755 (executable)
--- a/sg-report-job-history
+++ b/sg-report-job-history
@@ -20,7 +20,7 @@
 use strict qw(vars);
 
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use IO::Handle;
 use HTML::Entities;

diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl
index aacd946880e51ef462553f815766acba38a29d2f..70728953b5634220d68559eb42eaf44872726f06 100644 (file)
--- a/tcl/JobDB-Executive.tcl
+++ b/tcl/JobDB-Executive.tcl
@@ -147,7 +147,7 @@ proc db-ensure-open {} {
     catch { db-ensure-closed } ;# clean up any detritus
 
     set pl {
-       unshift @INC, qw(.);
+       BEGIN { unshift @INC, qw(.); }
        use Osstest;
        use Osstest::Executive;
        readglobalconfig();

diff --git a/tcl/osstestlib.tcl b/tcl/osstestlib.tcl
index dba656aac70dfe0d315f2a20d0c6ef38d905d2a3..a2ace4500c4782cb57fe1b46307a90d4bb2691d1 100644 (file)
--- a/tcl/osstestlib.tcl
+++ b/tcl/osstestlib.tcl
@@ -22,7 +22,7 @@ package require Tclx
 proc readconfig {} {
     global c
     set pl {
-       unshift @INC, qw(.);
+       BEGIN { unshift @INC, qw(.); }
         use Osstest;
         readglobalconfig();
         foreach my $k (sort keys %c) {

diff --git a/ts-build-check b/ts-build-check
index 92e19fb0f01a261ff8d615a7527325d20b0d803f..20599012b79e97167d2d8764f04670e9dca5b8e2 100755 (executable)
--- a/ts-build-check
+++ b/ts-build-check
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-coverity-build b/ts-coverity-build
index dc6320a1d0589298396f7f3ecbc3082d8456b21a..89475d18d756c5a98c61eef98c10e77181ce375e 100755 (executable)
--- a/ts-coverity-build
+++ b/ts-coverity-build
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use File::Path;
 use POSIX;

diff --git a/ts-coverity-upload b/ts-coverity-upload
index c52bb87585c1b83da1daf585c888f38e1ed77df3..829487a0734bb5c90a0e6dcc03855063df5c4a4e 100755 (executable)
--- a/ts-coverity-upload
+++ b/ts-coverity-upload
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use File::Path;
 use POSIX;

diff --git a/ts-debian-di-install b/ts-debian-di-install
index 320d0d9460a41c24d9eac7dc932318dbcb671f66..60079712e72991c3b0811fdbafb18109a2769bc3 100755 (executable)
--- a/ts-debian-di-install
+++ b/ts-debian-di-install
@@ -51,7 +51,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::Debian;
 use Osstest::TestSupport;

diff --git a/ts-debian-fixup b/ts-debian-fixup
index 571b250946066b58bf8be76a83a53fed3b591709..f1976e7d5712ddd3d6aea9c93e1ae74f979ee105 100755 (executable)
--- a/ts-debian-fixup
+++ b/ts-debian-fixup
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::Debian;

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index 7237b748956611d60a66df73cc6849e9e8d10660..54d5d1c2889a36ae664232b95d70d9fd740da879 100755 (executable)
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::Debian;
 use Osstest::TestSupport;

diff --git a/ts-debian-install b/ts-debian-install
index 4a662afd3a81e996e5816fb59b6ff8c12e113e2b..5bbaead0445264c568ce724893bbdc0837f2db88 100755 (executable)
--- a/ts-debian-install
+++ b/ts-debian-install
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::Debian;

diff --git a/ts-examine-logs-save b/ts-examine-logs-save
index b9c9941cf5ab9c0badc412d48a60623f0ae08d33..22aa33199061690a6489748f6ae0a0d7a00a8d12 100755 (executable)
--- a/ts-examine-logs-save
+++ b/ts-examine-logs-save
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict qw(vars);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-examine-serial-post b/ts-examine-serial-post
index 77d8e5df7663f352c1af538ae0b86a243f22c08c..ba1f3f280b822ea61fe67126fb5cb007a1a2d82f 100755 (executable)
--- a/ts-examine-serial-post
+++ b/ts-examine-serial-post
@@ -25,7 +25,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use POSIX;
 use Osstest::TestSupport;

diff --git a/ts-examine-serial-pre b/ts-examine-serial-pre
index 3905e527174b310e31dc6a5491376cc9def5b339..6ac3e10d9353e7d941847f0eb507646824d57df1 100755 (executable)
--- a/ts-examine-serial-pre
+++ b/ts-examine-serial-pre
@@ -23,7 +23,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use POSIX;
 use Osstest::TestSupport;

diff --git a/ts-freebsd-install b/ts-freebsd-install
index f74f2093b05d6a768b8143dd5834ea357c288cec..f081abc1ffa839424b9fee2192ff63381708cebf 100755 (executable)
--- a/ts-freebsd-install
+++ b/ts-freebsd-install
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-guest-destroy b/ts-guest-destroy
index 73834a5a02aee01f52f6e8cfd462308b237e9b3d..de41956cd612044050a13e4f80b0a553699f1fbe 100755 (executable)
--- a/ts-guest-destroy
+++ b/ts-guest-destroy
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-guest-destroy-hard b/ts-guest-destroy-hard
index 780bc4b3ff999e5e5aa4ad1f98839c9e3c456384..6f305c41e51930306d5ee50cc73e121a5ae87974 100755 (executable)
--- a/ts-guest-destroy-hard
+++ b/ts-guest-destroy-hard
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-guest-localmigrate b/ts-guest-localmigrate
index c06d77bb27d3a8eadbe1cea9bf8cd71753224ae2..e39614735b5590a32ebcbd3fb0a525b7e28cebf3 100755 (executable)
--- a/ts-guest-localmigrate
+++ b/ts-guest-localmigrate
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-guest-migrate b/ts-guest-migrate
index c4afe03db0fb6892474d429ca29bb945fb2f1103..b092d543f633c7093d6ec9be3034c8c412bf7186 100755 (executable)
--- a/ts-guest-migrate
+++ b/ts-guest-migrate
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-guest-saverestore b/ts-guest-saverestore
index c3b62cb8a16f4d1f53a21c036927b2b721abaf29..5bc99740086964428bf0f2f2c89039617174919d 100755 (executable)
--- a/ts-guest-saverestore
+++ b/ts-guest-saverestore
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-guest-start b/ts-guest-start
index a9ca73286573360f1c4ec9f19c6c9aba0ad69f76..7286fb31d2fa31020f02befb85530aa772946b70 100755 (executable)
--- a/ts-guest-start
+++ b/ts-guest-start
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-guest-stop b/ts-guest-stop
index 89d9f4ed7c7b93121a7d03a671a9cd01e4ff8328..ad6096fcb9688e5f6b7c39784b7c60260caaf081 100755 (executable)
--- a/ts-guest-stop
+++ b/ts-guest-stop
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-guests-nbd-mirror b/ts-guests-nbd-mirror
index e14c0e8b4916da76aa5779fc29ac12d5de78d43d..ca8300dbbdf5c386ec974a33a532c4038c849e0f 100755 (executable)
--- a/ts-guests-nbd-mirror
+++ b/ts-guests-nbd-mirror
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-host-fail b/ts-host-fail
index b219b200a554ad0d2c939b2606e9aea7712f802c..cf762dccb791224698f59b566bd2db9d5dca817b 100755 (executable)
--- a/ts-host-fail
+++ b/ts-host-fail
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-host-install b/ts-host-install
index 299eae481c4e505371c37ec89fdb5f1f75585d66..20b8a60da40c5d04e306ffe2c6b3208b13608aa4 100755 (executable)
--- a/ts-host-install
+++ b/ts-host-install
@@ -19,7 +19,7 @@ use strict qw(vars);
 use DBI;
 use POSIX;
 
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::Debian;
 use Osstest::TestSupport;

diff --git a/ts-host-ping-check b/ts-host-ping-check
index ec1c43d6a8177a9817414476af6e9b2de78c9023..a670680c23d3f27a8798e79351c2d6d5fae0a5b9 100755 (executable)
--- a/ts-host-ping-check
+++ b/ts-host-ping-check
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict qw(vars);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use DBI;
 use Osstest::TestSupport;

diff --git a/ts-host-powercycle b/ts-host-powercycle
index 5ca976e400f91819bdade2e71cc4f47743a494d4..5c1698c7d236136052e71bf06d4f9d8ba1f814f9 100755 (executable)
--- a/ts-host-powercycle
+++ b/ts-host-powercycle
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-host-reboot b/ts-host-reboot
index 1e71e6e4308b8a5f107b423343ec2f8300b4c667..ff1fc8e8d26c8e1af03ec77def0cb5a237bdd6c5 100755 (executable)
--- a/ts-host-reboot
+++ b/ts-host-reboot
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict qw(vars);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use DBI;
 use Osstest::TestSupport;

diff --git a/ts-hosts-allocate b/ts-hosts-allocate
index d2bef366f960301394017e13f888fdb9e86e9f8b..9c692b41629d4a2be6261e5e19a0c88de2e64a1c 100755 (executable)
--- a/ts-hosts-allocate
+++ b/ts-hosts-allocate
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive
index 54366a3300f4a2b7776a4f2e651aa790ecc0eaab..dcfc70f2bbc15a49ffa42104616a1b2453bec907 100755 (executable)
--- a/ts-hosts-allocate-Executive
+++ b/ts-hosts-allocate-Executive
@@ -17,7 +17,7 @@
 
 use strict;
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Data::Dumper;
 use POSIX;

diff --git a/ts-hosts-allocate-Standalone b/ts-hosts-allocate-Standalone
index 1311396efb9b60b6705e27490764466154f6f16e..8ff4700196bf9bf73bab56c2dac8998151d061ec 100755 (executable)
--- a/ts-hosts-allocate-Standalone
+++ b/ts-hosts-allocate-Standalone
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-kernel-build b/ts-kernel-build
index 94e67a47bbd9ba5447427460a186c6c955d3eec5..22a027a5ba580bdd2dc7f220d58f205e64e49bbc 100755 (executable)
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::BuildSupport;

diff --git a/ts-leak-check b/ts-leak-check
index 2712efaeda664bd3ed695cbb94d02b8d1bb08767..7dbabfe6909275d7d5886c37fcac03ecb1a5ab87 100755 (executable)
--- a/ts-leak-check
+++ b/ts-leak-check
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-libvirt-build b/ts-libvirt-build
index 419f3ecb923f32b6013640e43443ad9d7e03287e..bc08190af599173d5b0f99d69b72c03c661d8a9a 100755 (executable)
--- a/ts-libvirt-build
+++ b/ts-libvirt-build
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::BuildSupport;

diff --git a/ts-logs-capture b/ts-logs-capture
index 061a11829372666b8d72b2da887a06371914ffc7..ebf40721649c7c38698afd18be8d48817e96f8f9 100755 (executable)
--- a/ts-logs-capture
+++ b/ts-logs-capture
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict qw(vars);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use DBI;
 use IO::File;

diff --git a/ts-migrate-support-check b/ts-migrate-support-check
index 96e3bd335292d4c85a6868ec0a76a89f9823140e..c391ea34a859994071d830a7cff6dbc4ee403a47 100755 (executable)
--- a/ts-migrate-support-check
+++ b/ts-migrate-support-check
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-nested-setup b/ts-nested-setup
index fcbe3418d980bbd9dc8a0c0fdd51a5a4c0ffc65c..be3d373313a3ff83d611256170a8669754eef3e8 100755 (executable)
--- a/ts-nested-setup
+++ b/ts-nested-setup
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::Debian;
 use Osstest::TestSupport;

diff --git a/ts-redhat-install b/ts-redhat-install
index 9c83a5a1d5db2c70fa87476d5e50959e650eb095..7541200839e5c6ba73b9deb9c7459c7b40699748 100755 (executable)
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-remus-check b/ts-remus-check
index 4c7eeb445af09fb45de88fb7462db869b2c56068..f2f101a1edcc446ee51970da77a9e79af1aa99f0 100755 (executable)
--- a/ts-remus-check
+++ b/ts-remus-check
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-remus-start b/ts-remus-start
index 61b1f18ff15c2f14ae54df6c0a367cec9b0372b0..c4fdf35a61862bb49dbbcec106c19a3f163936ed 100755 (executable)
--- a/ts-remus-start
+++ b/ts-remus-start
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-repeat-test b/ts-repeat-test
index 557c7c966262e8e5defd8d3dbc20a707bea65d38..4625add845b9550d94bf0e6e09384c5e875d2b11 100755 (executable)
--- a/ts-repeat-test
+++ b/ts-repeat-test
@@ -11,7 +11,7 @@
 # \          at the start of any ARGSPEC is removed (after the checks above)
 
 use strict;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest::TestSupport;
 
 use Data::Dumper;

diff --git a/ts-rumprun-bake b/ts-rumprun-bake
index 719701660c2a003efd08629aa9b55d2c24687274..fc50db9208c95c9fe4e9280ffc8ad5c893ed53ff 100755 (executable)
--- a/ts-rumprun-bake
+++ b/ts-rumprun-bake
@@ -22,7 +22,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::BuildSupport;

diff --git a/ts-rumprun-build b/ts-rumprun-build
index ff2fb8faeacfdf57d1d34cd75691e9ef0542a6e4..a09584c8f2ac1ad43e0ba695110e7310f3f57784 100755 (executable)
--- a/ts-rumprun-build
+++ b/ts-rumprun-build
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::BuildSupport;

diff --git a/ts-rumprun-demo-build b/ts-rumprun-demo-build
index d3647121be69f0fd1bb6e1c996f395c9f170dc11..925727a044f3580918bf6a5ded9998d49a10ca01 100755 (executable)
--- a/ts-rumprun-demo-build
+++ b/ts-rumprun-demo-build
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use File::Path;
 use POSIX;

diff --git a/ts-rumprun-demo-setup b/ts-rumprun-demo-setup
index 8058049c1c32084ac2e07b63160762f923be661b..f293fd7e694fd0302e6bb0b2e374ba600f24050b 100755 (executable)
--- a/ts-rumprun-demo-setup
+++ b/ts-rumprun-demo-setup
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-rumprun-demo-xenstorels b/ts-rumprun-demo-xenstorels
index 5544faadfc7ff34a3a47877f24b1035ff7776063..cfc6a9036636fe539a4798156d983bac8f202d93 100755 (executable)
--- a/ts-rumprun-demo-xenstorels
+++ b/ts-rumprun-demo-xenstorels
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::RumpRun;

diff --git a/ts-rumprun-test-prep b/ts-rumprun-test-prep
index 0da7c2315d6a65419d69827526e668e41f9901e3..673717104dec84c22b53c405694a29534e607902 100755 (executable)
--- a/ts-rumprun-test-prep
+++ b/ts-rumprun-test-prep
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use POSIX;
 use Osstest::TestSupport;

diff --git a/ts-saverestore-support-check b/ts-saverestore-support-check
index 781324ce57ba1d3d3bd1181c417fcf0c5873c8aa..53af953062916cb9d42c7027564ec7b84c88fe37 100755 (executable)
--- a/ts-saverestore-support-check
+++ b/ts-saverestore-support-check
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-syslog-server b/ts-syslog-server
index b17c5313a1d60827ddd522c10a66e4ad2e6c9356..1234bb7dd18a5150707c2c1f921b8a25072f7e17 100755 (executable)
--- a/ts-syslog-server
+++ b/ts-syslog-server
@@ -17,7 +17,7 @@
 
 use strict;
 
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-windows-install b/ts-windows-install
index 4dc8f2a6c480f8c363cb2ffd5bc6890fce0f1bec..263fb9250b7d982cb4d5720ac520110018a77e68 100755 (executable)
--- a/ts-windows-install
+++ b/ts-windows-install
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-xen-build b/ts-xen-build
index 097ac0a51348e74d6359b4e27e25b8825085ca23..c5d2a1da95bc0ba15303bf2ca4aaf9683ad9467b 100755 (executable)
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use File::Path;
 use POSIX;

diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 37736b7f813b36ebd4f10beebca41a533cd3352b..3e98364a35a418335b0b1f568f4fe4bc8f951c06 100755 (executable)
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use POSIX;
 use Osstest::TestSupport;

diff --git a/ts-xen-install b/ts-xen-install
index 3ab60909fd76cafe5d25eaaef689a3d4262b282c..ec907c50b811abc7e1e5bba7a4d44364c7e90cf5 100755 (executable)
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use File::Path;
 use POSIX;

diff --git a/ts-xtf-build b/ts-xtf-build
index 1254b073d43b3a1fc9d1474c19b8e183a0bc7b84..07242ed9bfd6dab13521ede19a07813c5dcfddb9 100755 (executable)
--- a/ts-xtf-build
+++ b/ts-xtf-build
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use File::Path;
 use POSIX;

diff --git a/ts-xtf-fep b/ts-xtf-fep
index 49ce3d02b6a5909a5c0d6f853862ec0aa24a4301..1a55e2cfda4858ab7b9d66ecc6532f86223af83d 100755 (executable)
--- a/ts-xtf-fep
+++ b/ts-xtf-fep
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict qw(vars);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use POSIX;
 use Osstest::TestSupport;

diff --git a/ts-xtf-install b/ts-xtf-install
index d58ad02cac8e4bf2a9d658da4a44ee88ef556516..a64fd3299e31b0e85c7512b5d4500541d24ed9ab 100755 (executable)
--- a/ts-xtf-install
+++ b/ts-xtf-install
@@ -17,7 +17,7 @@
 
 use strict qw(vars);
 use DBI;
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/ts-xtf-run b/ts-xtf-run
index 5b136a6fd0c4e3abb33c62aa76339fcb921b15ce..e40320b881c37042e275dccc1f9de65d7c203a59 100755 (executable)
--- a/ts-xtf-run
+++ b/ts-xtf-run
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict qw(vars);
-unshift @INC, qw(.);
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 use POSIX;
 use Osstest::TestSupport;