t: Avoid redefining dirname

Signed-off-by: Niels Thykier <niels@thykier.net>

14 files changed, 14 insertions, 14 deletions

diff --git a/t/Test/DH.pm b/t/Test/DH.pm
index 080a669a..5affc889 100644
--- a/t/Test/DH.pm
+++ b/t/Test/DH.pm
@@ -31,7 +31,7 @@ $ENV{DH_AUTOSCRIPTDIR} = "$ROOT_DIR/autoscripts";
 delete($ENV{DEB_BUILD_PROFILES});
 delete($ENV{DEB_BUILD_OPTIONS});
 
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 our @EXPORT = qw(
     each_compat_up_to_and_incl_subtest each_compat_subtest
diff --git a/t/buildsystems/01-build-system-basic-api.t b/t/buildsystems/01-build-system-basic-api.t
index c7cb9703..02a6cc65 100755
--- a/t/buildsystems/01-build-system-basic-api.t
+++ b/t/buildsystems/01-build-system-basic-api.t
@@ -7,7 +7,7 @@ use Test::More tests => 12;
 use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 use Debian::Debhelper::Buildsystem;
 
 my $BS_CLASS = 'Debian::Debhelper::Buildsystem';
diff --git a/t/buildsystems/02-make-jobserver-makeflags.t b/t/buildsystems/02-make-jobserver-makeflags.t
index 9830bf58..56514529 100755
--- a/t/buildsystems/02-make-jobserver-makeflags.t
+++ b/t/buildsystems/02-make-jobserver-makeflags.t
@@ -7,7 +7,7 @@ use Test::More tests => 9;
 use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 # Test clean_jobserver_makeflags.
 
diff --git a/t/buildsystems/03-bs-auto-buildable.t b/t/buildsystems/03-bs-auto-buildable.t
index f836914d..83884c18 100755
--- a/t/buildsystems/03-bs-auto-buildable.t
+++ b/t/buildsystems/03-bs-auto-buildable.t
@@ -9,7 +9,7 @@ use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
 use File::Path qw(remove_tree make_path);
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 use Debian::Debhelper::Dh_Buildsystems;
 
 my @STEPS = qw(configure build test install clean);
diff --git a/t/buildsystems/04-dh_auto_do_autoconf.t b/t/buildsystems/04-dh_auto_do_autoconf.t
index aecf8714..e3bbceeb 100755
--- a/t/buildsystems/04-dh_auto_do_autoconf.t
+++ b/t/buildsystems/04-dh_auto_do_autoconf.t
@@ -9,7 +9,7 @@ use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
 use File::Path qw(remove_tree make_path);
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 use Debian::Debhelper::Dh_Buildsystems;
 
 # Let the tests to be run from anywhere but currect directory
diff --git a/t/buildsystems/05-load-build-system.t b/t/buildsystems/05-load-build-system.t
index 920fbeba..0004176b 100755
--- a/t/buildsystems/05-load-build-system.t
+++ b/t/buildsystems/05-load-build-system.t
@@ -10,7 +10,7 @@ use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
 use File::Path qw(remove_tree make_path);
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 use Debian::Debhelper::Buildsystem;
 
 my $DIR = dirname($0);
diff --git a/t/dh-lib.t b/t/dh-lib.t
index b38063d6..0101f030 100755
--- a/t/dh-lib.t
+++ b/t/dh-lib.t
@@ -8,7 +8,7 @@ use File::Basename qw(dirname);
 use lib dirname(__FILE__);
 use Test::DH;
 
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 plan(tests => 1);
 
diff --git a/t/dh_compress.t b/t/dh_compress.t
index d3987b58..11c3e133 100755
--- a/t/dh_compress.t
+++ b/t/dh_compress.t
@@ -9,7 +9,7 @@ use Test::DH;
 
 use File::Path qw(make_path remove_tree);
 use Test::More;
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 my $PREFIX = 'debian/debhelper/usr/share/doc/debhelper';
 
diff --git a/t/dh_install/01-basics.t b/t/dh_install/01-basics.t
index 9af589ab..863c92c9 100755
--- a/t/dh_install/01-basics.t
+++ b/t/dh_install/01-basics.t
@@ -7,7 +7,7 @@ use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
 use File::Path qw(remove_tree make_path);
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 plan(tests => 2);
 
diff --git a/t/dh_install/02-bugs-53XXXX.t b/t/dh_install/02-bugs-53XXXX.t
index aa4de5a3..1c42489d 100755
--- a/t/dh_install/02-bugs-53XXXX.t
+++ b/t/dh_install/02-bugs-53XXXX.t
@@ -7,7 +7,7 @@ use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
 use File::Path qw(remove_tree make_path);
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 plan(tests => 4);
 
diff --git a/t/dh_install/03-866570-dont-install-from-host.t b/t/dh_install/03-866570-dont-install-from-host.t
index b815b6ce..33834d9b 100755
--- a/t/dh_install/03-866570-dont-install-from-host.t
+++ b/t/dh_install/03-866570-dont-install-from-host.t
@@ -7,7 +7,7 @@ use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
 use File::Path qw(remove_tree make_path);
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 plan(tests => 1);
 
diff --git a/t/dh_install/04-sourcedir.t b/t/dh_install/04-sourcedir.t
index 8b574c76..c624723e 100755
--- a/t/dh_install/04-sourcedir.t
+++ b/t/dh_install/04-sourcedir.t
@@ -7,7 +7,7 @@ use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
 use File::Path qw(remove_tree make_path);
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 plan(tests => 6);
 
diff --git a/t/dh_installinit/dh_installinit.t b/t/dh_installinit/dh_installinit.t
index 3898c52b..098107cd 100755
--- a/t/dh_installinit/dh_installinit.t
+++ b/t/dh_installinit/dh_installinit.t
@@ -6,7 +6,7 @@ use File::Basename qw(dirname);
 use lib dirname(dirname(__FILE__));
 use Test::DH;
 use File::Path qw(remove_tree make_path);
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 our @TEST_DH_EXTRA_TEMPLATE_FILES = (qw(
     debian/changelog
diff --git a/t/maintscript.t b/t/maintscript.t
index f033a50e..8e421585 100755
--- a/t/maintscript.t
+++ b/t/maintscript.t
@@ -7,7 +7,7 @@ use File::Path qw(remove_tree);
 use File::Basename qw(dirname);
 use lib dirname(__FILE__);
 use Test::DH;
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(!dirname);
 
 if (uid_0_test_is_ok()) {
 	plan(tests => 1);