diff options
| -rw-r--r-- | scripts/t/Dpkg_Arch.t | 4 | ||||
| -rw-r--r-- | scripts/t/Dpkg_BuildOptions.t | 1 | ||||
| -rw-r--r-- | scripts/t/Dpkg_Changelog.t | 1 | ||||
| -rw-r--r-- | scripts/t/Dpkg_Deps.t | 1 | ||||
| -rw-r--r-- | scripts/t/Dpkg_IPC.t | 1 | ||||
| -rw-r--r-- | scripts/t/Dpkg_Substvars.t | 4 | ||||
| -rw-r--r-- | scripts/t/Dpkg_Version.t | 1 | ||||
| -rw-r--r-- | scripts/t/merge_changelogs.t | 3 | ||||
| -rw-r--r-- | src/t/dpkg_divert.t | 8 | ||||
| -rw-r--r-- | utils/t/update_alternatives.t | 12 |
10 files changed, 23 insertions, 13 deletions
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t index 91759ec0e..9ebbea9dc 100644 --- a/scripts/t/Dpkg_Arch.t +++ b/scripts/t/Dpkg_Arch.t @@ -13,11 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -use Test::More tests => 42; - use strict; use warnings; +use Test::More tests => 42; + use_ok('Dpkg::Arch', qw(debarch_to_debtriplet debarch_to_multiarch debarch_eq debarch_is debarch_is_wildcard)); diff --git a/scripts/t/Dpkg_BuildOptions.t b/scripts/t/Dpkg_BuildOptions.t index d8b8ff348..6960235ac 100644 --- a/scripts/t/Dpkg_BuildOptions.t +++ b/scripts/t/Dpkg_BuildOptions.t @@ -17,6 +17,7 @@ use strict; use warnings; use Test::More tests => 24; + use Dpkg::ErrorHandling; use_ok('Dpkg::BuildOptions'); diff --git a/scripts/t/Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t index 6a7fb42f3..f633978c4 100644 --- a/scripts/t/Dpkg_Changelog.t +++ b/scripts/t/Dpkg_Changelog.t @@ -19,6 +19,7 @@ use warnings; use Test::More tests => 84; use File::Basename; + use Dpkg::File; BEGIN { diff --git a/scripts/t/Dpkg_Deps.t b/scripts/t/Dpkg_Deps.t index 9fa06d8f8..af6f716c2 100644 --- a/scripts/t/Dpkg_Deps.t +++ b/scripts/t/Dpkg_Deps.t @@ -17,6 +17,7 @@ use strict; use warnings; use Test::More tests => 45; + use Dpkg::Arch qw(get_host_arch); use Dpkg::Version; diff --git a/scripts/t/Dpkg_IPC.t b/scripts/t/Dpkg_IPC.t index d312f319d..02951bdaa 100644 --- a/scripts/t/Dpkg_IPC.t +++ b/scripts/t/Dpkg_IPC.t @@ -17,6 +17,7 @@ use strict; use warnings; use Test::More tests => 8; + use File::Temp qw(tempfile); use_ok('Dpkg::IPC'); diff --git a/scripts/t/Dpkg_Substvars.t b/scripts/t/Dpkg_Substvars.t index 5a9c18313..c46c391ff 100644 --- a/scripts/t/Dpkg_Substvars.t +++ b/scripts/t/Dpkg_Substvars.t @@ -13,11 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -use Test::More tests => 32; - use strict; use warnings; +use Test::More tests => 32; + use Dpkg (); use Dpkg::Arch qw(get_host_arch); diff --git a/scripts/t/Dpkg_Version.t b/scripts/t/Dpkg_Version.t index f719accfa..963e7655c 100644 --- a/scripts/t/Dpkg_Version.t +++ b/scripts/t/Dpkg_Version.t @@ -17,6 +17,7 @@ use strict; use warnings; use Test::More; + use Dpkg::ErrorHandling; report_options(quiet_warnings => 1); diff --git a/scripts/t/merge_changelogs.t b/scripts/t/merge_changelogs.t index 1e8c43e37..bfe54e5a4 100644 --- a/scripts/t/merge_changelogs.t +++ b/scripts/t/merge_changelogs.t @@ -18,11 +18,12 @@ use warnings; use Test::More tests => 3; -use Dpkg::IPC; use File::Spec; use File::Compare; use File::Temp; +use Dpkg::IPC; + my $srcdir = $ENV{srcdir} || '.'; my $datadir = "$srcdir/t/merge_changelogs"; diff --git a/src/t/dpkg_divert.t b/src/t/dpkg_divert.t index 9c4b3c63a..93265b3bc 100644 --- a/src/t/dpkg_divert.t +++ b/src/t/dpkg_divert.t @@ -13,14 +13,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. +use strict; +use warnings; + use Test::More; + use File::Spec; + use Dpkg::File; use Dpkg::IPC; -use strict; -use warnings; - # Cleanup environment from variables that pollute the test runs. delete $ENV{DPKG_MAINTSCRIPT_PACKAGE}; delete $ENV{DPKG_MAINTSCRIPT_ARCH}; diff --git a/utils/t/update_alternatives.t b/utils/t/update_alternatives.t index 7f779a9e9..491fee07d 100644 --- a/utils/t/update_alternatives.t +++ b/utils/t/update_alternatives.t @@ -13,14 +13,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -use Dpkg::IPC; -use Dpkg::Path qw(find_command); -use File::Spec; -use Test::More; - use strict; use warnings; +use Test::More; + +use File::Spec; + +use Dpkg::IPC; +use Dpkg::Path qw(find_command); + my $srcdir = $ENV{srcdir} || '.'; my $tmpdir = 't.tmp/update_alternatives'; my $admindir = File::Spec->rel2abs("$tmpdir/admindir"), |