Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

1 files changed, 13 insertions, 1 deletions

diff --git a/t/dh_install b/t/dh_install
index 2557fbf4..447a40a8 100755
--- a/t/dh_install
+++ b/t/dh_install
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Test;
-plan(tests => 21);
+plan(tests => 23);
 
 system("rm -rf debian/debhelper debian/tmp");
 
@@ -74,3 +74,15 @@ system("rm -rf debian/debhelper debian/tmp");
 system("./dh_install", "dh_install", "usr/bin");
 ok(-e "debian/debhelper/usr/bin/dh_install");
 system("rm -rf debian/debhelper debian/tmp");
+
+# specification of file in source directory not in debian/tmp
+system("mkdir -p bar/usr/bin; touch bar/usr/bin/foo");
+system("./dh_install", "--sourcedir=bar", "usr/bin/foo");
+ok(-e "debian/debhelper/usr/bin/foo");
+system("rm -rf debian/debhelper bar");
+
+# specification of file in subdir, not in debian/tmp
+system("mkdir -p bar/usr/bin; touch bar/usr/bin/foo");
+system("./dh_install", "bar/usr/bin/foo");
+ok(-e "debian/debhelper/bar/usr/bin/foo");
+system("rm -rf debian/debhelper bar");