|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [OSSTEST PATCH 2/2] 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@xxxxxxxxxxxxx>
---
adhoc-revtuple-generator | 2 +-
cr-disk-report | 2 +-
cr-ensure-disk-space | 2 +-
cr-publish-flight-logs | 2 +-
cs-adjust-flight | 2 +-
cs-bisection-step | 2 +-
cs-flight-bless | 2 +-
cs-flight-create | 2 +-
cs-hosts-list | 2 +-
cs-job-create | 2 +-
determine-failure-reasons | 2 +-
mg-allocate | 2 +-
mg-blockage | 2 +-
mg-db-activity-logger | 2 +-
mg-db-activity-redactor | 2 +-
mg-hosts | 2 +-
mg-queue-inhibit | 2 +-
mg-report-host-usage-collect | 2 +-
mg-schema-update | 2 +-
mg-show-flight-runvars | 2 +-
ms-flights-summary | 2 +-
ms-planner | 2 +-
ms-planner-debug | 2 +-
sg-check-tested | 2 +-
sg-report-flight | 2 +-
sg-report-host-history | 2 +-
sg-report-job-history | 2 +-
tcl/JobDB-Executive.tcl | 2 +-
tcl/osstestlib.tcl | 2 +-
ts-build-check | 2 +-
ts-coverity-build | 2 +-
ts-coverity-upload | 2 +-
ts-debian-di-install | 2 +-
ts-debian-fixup | 2 +-
ts-debian-hvm-install | 2 +-
ts-debian-install | 2 +-
ts-examine-logs-save | 2 +-
ts-examine-serial-post | 2 +-
ts-examine-serial-pre | 2 +-
ts-freebsd-install | 2 +-
ts-guest-destroy | 2 +-
ts-guest-destroy-hard | 2 +-
ts-guest-localmigrate | 2 +-
ts-guest-migrate | 2 +-
ts-guest-saverestore | 2 +-
ts-guest-start | 2 +-
ts-guest-stop | 2 +-
ts-guests-nbd-mirror | 2 +-
ts-host-fail | 2 +-
ts-host-install | 2 +-
ts-host-ping-check | 2 +-
ts-host-powercycle | 2 +-
ts-host-reboot | 2 +-
ts-hosts-allocate | 2 +-
ts-hosts-allocate-Executive | 2 +-
ts-hosts-allocate-Standalone | 2 +-
ts-kernel-build | 2 +-
ts-leak-check | 2 +-
ts-libvirt-build | 2 +-
ts-logs-capture | 2 +-
ts-migrate-support-check | 2 +-
ts-nested-setup | 2 +-
ts-redhat-install | 2 +-
ts-remus-check | 2 +-
ts-remus-start | 2 +-
ts-repeat-test | 2 +-
ts-rumprun-bake | 2 +-
ts-rumprun-build | 2 +-
ts-rumprun-demo-build | 2 +-
ts-rumprun-demo-setup | 2 +-
ts-rumprun-demo-xenstorels | 2 +-
ts-rumprun-test-prep | 2 +-
ts-saverestore-support-check | 2 +-
ts-syslog-server | 2 +-
ts-windows-install | 2 +-
ts-xen-build | 2 +-
ts-xen-build-prep | 2 +-
ts-xen-install | 2 +-
ts-xtf-build | 2 +-
ts-xtf-fep | 2 +-
ts-xtf-install | 2 +-
ts-xtf-run | 2 +-
82 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/adhoc-revtuple-generator b/adhoc-revtuple-generator
index 39fc523..1e04773 100755
--- 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 a386ce4..543d35b 100755
--- 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 da5cd7c..8d3d443 100755
--- 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 b3f4128..45545ce 100755
--- 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 0be104e..f443cfd 100755
--- 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 13ccd7a..0be8bd0 100755
--- 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 0494997..78dd919 100755
--- 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 dc61e62..71f1fda 100755
--- 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 306b04e..6b910ae 100755
--- 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 85d576c..064a929 100755
--- 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 89c67e6..cf40ca3 100755
--- 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 dadac3c..c30dd15 100755
--- 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 f0af91e..dbec6df 100755
--- 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 8a38940..eb4e741 100755
--- 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 2ab6cfe..db40a1b 100755
--- 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 2ed42fc..a000f2d 100755
--- 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 93f254c..a0fcf01 100755
--- 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 6a8cc68..160d295 100755
--- 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 44e4283..770d82a 100755
--- 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 7e8bd8e..8da8539 100755
--- 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 0e5cd4d..9d15dd1 100755
--- 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 c060b02..af0c746 100755
--- 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 acfbc22..c82666d 100755
--- 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 a0a2db7..7946e4b 100755
--- 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 e5f1bb9..dba3641 100755
--- 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 cb98ea0..e86e03b 100755
--- 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 1115793..d5f91ff 100755
--- 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 aacd946..7072895 100644
--- 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 dba656a..a2ace45 100644
--- 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 92e19fb..2059901 100755
--- 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 dc6320a..89475d1 100755
--- 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 c52bb87..829487a 100755
--- 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 320d0d9..6007971 100755
--- 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 571b250..f1976e7 100755
--- 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 7237b74..54d5d1c 100755
--- 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 4a662af..5bbaead 100755
--- 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 b9c9941..22aa331 100755
--- 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 77d8e5d..ba1f3f2 100755
--- 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 3905e52..6ac3e10 100755
--- 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 f74f209..f081abc 100755
--- 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 73834a5..de41956 100755
--- 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 780bc4b..6f305c4 100755
--- 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 c06d77b..e396147 100755
--- 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 c4afe03..b092d54 100755
--- 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 c3b62cb..5bc9974 100755
--- 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 a9ca732..7286fb3 100755
--- 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 89d9f4e..ad6096f 100755
--- 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 e14c0e8..ca8300d 100755
--- 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 b219b20..cf762dc 100755
--- 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 299eae4..20b8a60 100755
--- 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 ec1c43d..a670680 100755
--- 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 5ca976e..5c1698c 100755
--- 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 1e71e6e..ff1fc8e 100755
--- 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 d2bef36..9c692b4 100755
--- 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 54366a3..dcfc70f 100755
--- 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 1311396..8ff4700 100755
--- 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 94e67a4..22a027a 100755
--- 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 2712efa..7dbabfe 100755
--- 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 419f3ec..bc08190 100755
--- 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 061a118..ebf4072 100755
--- 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 96e3bd3..c391ea3 100755
--- 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 fcbe341..be3d373 100755
--- 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 9c83a5a..7541200 100755
--- 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 4c7eeb4..f2f101a 100755
--- 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 61b1f18..c4fdf35 100755
--- 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 557c7c9..4625add 100755
--- 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 7197016..fc50db9 100755
--- 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 ff2fb8f..a09584c 100755
--- 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 d364712..925727a 100755
--- 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 8058049..f293fd7 100755
--- 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 5544faa..cfc6a90 100755
--- 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 0da7c23..6737171 100755
--- 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 781324c..53af953 100755
--- 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 b17c531..1234bb7 100755
--- 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 4dc8f2a..263fb92 100755
--- 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 097ac0a..c5d2a1d 100755
--- 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 37736b7..3e98364 100755
--- 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 3ab6090..ec907c5 100755
--- 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 1254b07..07242ed 100755
--- 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 49ce3d0..1a55e2c 100755
--- 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 d58ad02..a64fd32 100755
--- 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 5b136a6..e40320b 100755
--- 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;
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |