[debhelper-devel] [debhelper] 25/30: t: Split up dh_link test

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 6bd2369f2be68a750eebdbce95d83b86f6b1f1d5
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jul 3 11:06:58 2017 +0000

    t: Split up dh_link test
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 t/{dh_link.t => dh_link/01-basic.t} | 13 +------------
 t/dh_link/02-346405.t               | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/t/dh_link.t b/t/dh_link/01-basic.t
similarity index 73%
rename from t/dh_link.t
rename to t/dh_link/01-basic.t
index da2de1a..220ea19 100755
--- a/t/dh_link.t
+++ b/t/dh_link/01-basic.t
@@ -8,7 +8,7 @@ plan(tests => 1);
 
 use File::Path qw(remove_tree);
 use File::Basename qw(dirname);
-use lib dirname(__FILE__);
+use lib dirname(dirname(__FILE__));
 use Test::DH;
 
 each_compat_subtest {
@@ -37,17 +37,6 @@ each_compat_subtest {
 	ok(run_dh_tool('dh_link'));
 	ok(readlink("debian/debhelper/usr/lib/libm.so"), "/lib/libm.so");
 
-	# Check links to the current directory and below, they used to be
-	# unnecessarily long (#346405).
-	ok(run_dh_tool('dh_link', 'usr/lib/geant4', 'usr/lib/geant4/a'));
-	ok(readlink("debian/debhelper/usr/lib/geant4/a"), ".");
-	ok(run_dh_tool('dh_link', 'usr/lib', 'usr/lib/geant4/b'));
-	ok(readlink("debian/debhelper/usr/lib/geant4/b"), "..");
-	ok(run_dh_tool('dh_link', 'usr', 'usr/lib/geant4/c'));
-	ok(readlink("debian/debhelper/usr/lib/geant4/c"), "../..");
-	ok(run_dh_tool('dh_link', '/', 'usr/lib/geant4/d'));
-	ok(readlink("debian/debhelper/usr/lib/geant4/d"), "/");
-
 	# Link to self.
 	ok(run_dh_tool({ 'quiet' => 1 }, 'dh_link', 'usr/lib/foo', 'usr/lib/foo'));
 	ok(! -l "debian/debhelper/usr/lib/foo");
diff --git a/t/dh_link/02-346405.t b/t/dh_link/02-346405.t
new file mode 100755
index 0000000..ce64ddd
--- /dev/null
+++ b/t/dh_link/02-346405.t
@@ -0,0 +1,34 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+plan(tests => 1);
+
+use File::Path qw(remove_tree);
+use File::Basename qw(dirname);
+use lib dirname(dirname(__FILE__));
+use Test::DH;
+
+each_compat_subtest {
+
+	remove_tree('debian/debhelper');
+
+	# Check links to the current directory and below, they used to be
+	# unnecessarily long (#346405).
+	ok(run_dh_tool('dh_link', 'usr/lib/geant4', 'usr/lib/geant4/a'));
+	ok(readlink("debian/debhelper/usr/lib/geant4/a"), ".");
+	ok(run_dh_tool('dh_link', 'usr/lib', 'usr/lib/geant4/b'));
+	ok(readlink("debian/debhelper/usr/lib/geant4/b"), "..");
+	ok(run_dh_tool('dh_link', 'usr', 'usr/lib/geant4/c'));
+	ok(readlink("debian/debhelper/usr/lib/geant4/c"), "../..");
+	ok(run_dh_tool('dh_link', '/', 'usr/lib/geant4/d'));
+	ok(readlink("debian/debhelper/usr/lib/geant4/d"), "/");
+};
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git