[debhelper-devel] [debhelper] 26/30: t: Avoid redefining dirname
Niels Thykier
nthykier at moszumanska.debian.org
Mon Jul 3 14:40:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit 74dc778ecb67f1d7df8bca592b5c2d8da2bf269e
Author: Niels Thykier <niels at thykier.net>
Date: Mon Jul 3 11:58:00 2017 +0000
t: Avoid redefining dirname
Signed-off-by: Niels Thykier <niels at thykier.net>
---
t/Test/DH.pm | 2 +-
t/buildsystems/01-build-system-basic-api.t | 2 +-
t/buildsystems/02-make-jobserver-makeflags.t | 2 +-
t/buildsystems/03-bs-auto-buildable.t | 2 +-
t/buildsystems/04-dh_auto_do_autoconf.t | 2 +-
t/buildsystems/05-load-build-system.t | 2 +-
t/dh-lib.t | 2 +-
t/dh_compress.t | 2 +-
t/dh_install/01-basics.t | 2 +-
t/dh_install/02-bugs-53XXXX.t | 2 +-
t/dh_install/03-866570-dont-install-from-host.t | 2 +-
t/dh_install/04-sourcedir.t | 2 +-
t/dh_installinit/dh_installinit.t | 2 +-
t/maintscript.t | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/t/Test/DH.pm b/t/Test/DH.pm
index 080a669..5affc88 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 c7cb970..02a6cc6 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 9830bf5..5651452 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 f836914..83884c1 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 aecf871..e3bbcee 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 920fbeb..0004176 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 b38063d..0101f03 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 d3987b5..11c3e13 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 9af589a..863c92c 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 aa4de5a..1c42489 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 b815b6c..33834d9 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 8b574c7..c624723 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 3898c52..098107c 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 f033a50..8e42158 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);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list