X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2Fdh_install;h=447a40a8fe67e6eded258a34d09f1010e7effa60;hb=18a0da8092ea9f3dc48bca92b36f592af25a608d;hp=37aff7b229d33b141690433b0befaf0cb0689d1c;hpb=452b7e6a61be42b2c345cdeeb00fbe51f88fce32;p=debhelper.git

diff --git a/t/dh_install b/t/dh_install
index 37aff7b..447a40a 100755
--- a/t/dh_install
+++ b/t/dh_install
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Test;
-plan(tests => 13);
+plan(tests => 23);
 
 system("rm -rf debian/debhelper debian/tmp");
 
@@ -12,6 +12,27 @@ ok(-e "debian/debhelper/usr/bin/foo");
 ok(! -e "debian/debhelper/usr/bin/bar");
 system("rm -rf debian/debhelper debian/tmp");
 
+# debian/tmp explicitly specified in filenames in older compat level
+system("mkdir -p debian/tmp/usr/bin; touch debian/tmp/usr/bin/foo; touch debian/tmp/usr/bin/bar");
+system("DH_COMPAT=6 ./dh_install debian/tmp/usr/bin/foo");
+ok(-e "debian/debhelper/usr/bin/foo");
+ok(! -e "debian/debhelper/usr/bin/bar");
+system("rm -rf debian/debhelper debian/tmp");
+
+# --sourcedir=debian/tmp in older compat level
+system("mkdir -p debian/tmp/usr/bin; touch debian/tmp/usr/bin/foo; touch debian/tmp/usr/bin/bar");
+system("DH_COMPAT=6 ./dh_install --sourcedir=debian/tmp usr/bin/foo");
+ok(-e "debian/debhelper/usr/bin/foo");
+ok(! -e "debian/debhelper/usr/bin/bar");
+system("rm -rf debian/debhelper debian/tmp");
+
+# redundant --sourcedir=debian/tmp in v7+
+system("mkdir -p debian/tmp/usr/bin; touch debian/tmp/usr/bin/foo; touch debian/tmp/usr/bin/bar");
+system("./dh_install --sourcedir=debian/tmp usr/bin/foo");
+ok(-e "debian/debhelper/usr/bin/foo");
+ok(! -e "debian/debhelper/usr/bin/bar");
+system("rm -rf debian/debhelper debian/tmp");
+
 # #537017: --sourcedir=debian/tmp/foo is used
 system("mkdir -p debian/tmp/foo/usr/bin; touch debian/tmp/foo/usr/bin/foo; touch debian/tmp/foo/usr/bin/bar");
 system("./dh_install", "--sourcedir=debian/tmp/foo", "usr/bin/bar");
@@ -33,6 +54,13 @@ ok(-e "debian/debhelper/usr/bin/foo");
 ok(-e "debian/debhelper/usr/bin/bar");
 system("rm -rf debian/debhelper debian/tmp");
 
+# no fallback to debian/tmp before v7
+system("mkdir -p debian/tmp/usr/bin; touch debian/tmp/usr/bin/foo; touch debian/tmp/usr/bin/bar");
+system("DH_COMPAT=6 ./dh_install usr/bin 2>/dev/null");
+ok(! -e "debian/debhelper/usr/bin/foo");
+ok(! -e "debian/debhelper/usr/bin/bar");
+system("rm -rf debian/debhelper debian/tmp");
+
 # #534565: glob expands to dangling symlink -> should install the dangling link
 system("mkdir -p debian/tmp/usr/bin; ln -s broken debian/tmp/usr/bin/foo; touch debian/tmp/usr/bin/bar");
 system("./dh_install", "usr/bin/*");
@@ -46,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");