From 047cf6685c72fbe837dd2f5feb5a40979ac19226 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 6 Jan 2013 03:51:07 +0100 Subject: perl: Place strict and warning pragma uses as the first thing --- dselect/methods/Dselect/Ftp.pm | 6 +++--- scripts/t/100_Dpkg_Version.t | 6 +++--- scripts/t/150_Dpkg_Package.t | 4 ++-- scripts/t/190_Dpkg_Shlibs_Cppfilt.t | 4 ++-- scripts/t/200_Dpkg_Shlibs.t | 6 +++--- scripts/t/300_Dpkg_BuildOptions.t | 6 +++--- scripts/t/400_Dpkg_Deps.t | 4 ++-- scripts/t/500_Dpkg_Path.t | 4 ++-- scripts/t/700_Dpkg_Control.t | 4 ++-- scripts/t/800_Dpkg_IPC.t | 4 ++-- scripts/t/850_Dpkg_Compression.t | 4 ++-- scripts/t/910_merge_changelogs.t | 6 +++--- test/000_pod.t | 4 ++-- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dselect/methods/Dselect/Ftp.pm b/dselect/methods/Dselect/Ftp.pm index be9abb7ce..a8bd23904 100644 --- a/dselect/methods/Dselect/Ftp.pm +++ b/dselect/methods/Dselect/Ftp.pm @@ -12,14 +12,14 @@ package Dselect::Ftp; -use Net::FTP; -use Data::Dumper; - use strict; use warnings; use Exporter qw(import); +use Net::FTP; +use Data::Dumper; + our @EXPORT = qw(%config yesno do_connect do_mdtm add_site edit_site edit_config read_config store_config view_mirrors nb); our %config; diff --git a/scripts/t/100_Dpkg_Version.t b/scripts/t/100_Dpkg_Version.t index db7b2dda0..d5fa6e998 100644 --- a/scripts/t/100_Dpkg_Version.t +++ b/scripts/t/100_Dpkg_Version.t @@ -13,12 +13,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More; -use Dpkg::ErrorHandling; - use strict; use warnings; +use Test::More; +use Dpkg::ErrorHandling; + report_options(quiet_warnings => 1); my @tests = ; diff --git a/scripts/t/150_Dpkg_Package.t b/scripts/t/150_Dpkg_Package.t index 5ea298842..338067dba 100644 --- a/scripts/t/150_Dpkg_Package.t +++ b/scripts/t/150_Dpkg_Package.t @@ -13,11 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More tests => 6; - use strict; use warnings; +use Test::More tests => 6; + use_ok('Dpkg::Package'); ok(pkg_name_is_illegal(undef)); diff --git a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t b/scripts/t/190_Dpkg_Shlibs_Cppfilt.t index 1bda4a5a0..6ad0902c8 100644 --- a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t +++ b/scripts/t/190_Dpkg_Shlibs_Cppfilt.t @@ -13,11 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More tests => 124; - use strict; use warnings; +use Test::More tests => 124; + use_ok('Dpkg::Shlibs::Cppfilt'); # Simple C++ demangling tests diff --git a/scripts/t/200_Dpkg_Shlibs.t b/scripts/t/200_Dpkg_Shlibs.t index 99e507374..f91736a71 100644 --- a/scripts/t/200_Dpkg_Shlibs.t +++ b/scripts/t/200_Dpkg_Shlibs.t @@ -13,13 +13,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +use strict; +use warnings; + use Test::More tests => 106; use Cwd; use IO::String; -use strict; -use warnings; - use_ok('Dpkg::Shlibs'); my $tmp; diff --git a/scripts/t/300_Dpkg_BuildOptions.t b/scripts/t/300_Dpkg_BuildOptions.t index cd1d7d7d2..29ef736a7 100644 --- a/scripts/t/300_Dpkg_BuildOptions.t +++ b/scripts/t/300_Dpkg_BuildOptions.t @@ -13,12 +13,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More tests => 24; -use Dpkg::ErrorHandling; - use strict; use warnings; +use Test::More tests => 24; +use Dpkg::ErrorHandling; + use_ok('Dpkg::BuildOptions'); { diff --git a/scripts/t/400_Dpkg_Deps.t b/scripts/t/400_Dpkg_Deps.t index 93a53cedd..b37a1c607 100644 --- a/scripts/t/400_Dpkg_Deps.t +++ b/scripts/t/400_Dpkg_Deps.t @@ -13,12 +13,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More tests => 20; - use strict; use warnings; +use Test::More tests => 20; use Dpkg::Arch qw(get_host_arch); + use_ok('Dpkg::Deps'); my $field_multiline = ' , , libgtk2.0-common (= 2.10.13-1) , libatk1.0-0 (>= diff --git a/scripts/t/500_Dpkg_Path.t b/scripts/t/500_Dpkg_Path.t index 930c8cdc6..2164f5051 100644 --- a/scripts/t/500_Dpkg_Path.t +++ b/scripts/t/500_Dpkg_Path.t @@ -13,11 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More tests => 16; - use strict; use warnings; +use Test::More tests => 16; + use_ok('Dpkg::Path', 'canonpath', 'resolve_symlink', 'check_files_are_the_same', 'get_pkg_root_dir', 'guess_pkg_root_dir', 'relative_to_pkg_root'); diff --git a/scripts/t/700_Dpkg_Control.t b/scripts/t/700_Dpkg_Control.t index 2018db562..60b5688a0 100644 --- a/scripts/t/700_Dpkg_Control.t +++ b/scripts/t/700_Dpkg_Control.t @@ -13,10 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More tests => 22; - use strict; use warnings; + +use Test::More tests => 22; use IO::String; BEGIN { diff --git a/scripts/t/800_Dpkg_IPC.t b/scripts/t/800_Dpkg_IPC.t index 4af1d7b72..c49d0dd28 100644 --- a/scripts/t/800_Dpkg_IPC.t +++ b/scripts/t/800_Dpkg_IPC.t @@ -13,10 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More tests => 8; - use strict; use warnings; + +use Test::More tests => 8; use File::Temp qw(tempfile); use_ok('Dpkg::IPC'); diff --git a/scripts/t/850_Dpkg_Compression.t b/scripts/t/850_Dpkg_Compression.t index 4bac076f6..6f0e9b090 100644 --- a/scripts/t/850_Dpkg_Compression.t +++ b/scripts/t/850_Dpkg_Compression.t @@ -13,11 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More tests => 13; - use strict; use warnings; +use Test::More tests => 13; + use_ok('Dpkg::Compression'); use_ok('Dpkg::Compression::FileHandle'); diff --git a/scripts/t/910_merge_changelogs.t b/scripts/t/910_merge_changelogs.t index 932ae4ec2..20d8cc166 100644 --- a/scripts/t/910_merge_changelogs.t +++ b/scripts/t/910_merge_changelogs.t @@ -13,6 +13,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +use strict; +use warnings; + use Test::More tests => 3; use Dpkg::IPC; @@ -20,9 +23,6 @@ use File::Spec; use File::Compare; use File::Temp qw(tempfile); -use strict; -use warnings; - my $srcdir = $ENV{srcdir} || '.'; my $datadir = "$srcdir/t/910_merge_changelogs"; diff --git a/test/000_pod.t b/test/000_pod.t index 0282a7d0e..40032779e 100644 --- a/test/000_pod.t +++ b/test/000_pod.t @@ -13,11 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -use Test::More; - use strict; use warnings; +use Test::More; + eval 'use Test::Pod 1.00'; plan skip_all => 'Test::Pod 1.00 required for testing POD' if $@; my @poddirs = ( $ENV{srcdir} || '.' ); -- cgit v1.2.3