[debhelper-devel] [debhelper] 01/02: t: Fix test issues with the new compat deprecations

Niels Thykier nthykier at moszumanska.debian.org
Sun Oct 2 15:30:14 UTC 2016


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

nthykier pushed a commit to branch master
in repository debhelper.

commit 4dad75a9f1f602d1a72f86b03d8a00ed6a6566bc
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Oct 2 15:16:23 2016 +0000

    t: Fix test issues with the new compat deprecations
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 t/buildsystems/autoconf/configure  | 1 +
 t/buildsystems/buildsystem_tests.t | 2 +-
 t/buildsystems/debian/compat       | 2 +-
 t/dh_install.t                     | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/t/buildsystems/autoconf/configure b/t/buildsystems/autoconf/configure
index 80cf3ec..73715c8 100755
--- a/t/buildsystems/autoconf/configure
+++ b/t/buildsystems/autoconf/configure
@@ -14,6 +14,7 @@ my @OPTIONS=qw(
    ^--sysconfdir=/etc$
    ^--localstatedir=/var$
    ^--libexecdir=\$\{prefix\}/lib/.*$
+   ^--libdir=\$\{prefix\}/lib/.*$
    ^--disable-silent-rules$
    ^--disable-maintainer-mode$
    ^--disable-dependency-tracking$
diff --git a/t/buildsystems/buildsystem_tests.t b/t/buildsystems/buildsystem_tests.t
index 5a0f57c..098f314 100755
--- a/t/buildsystems/buildsystem_tests.t
+++ b/t/buildsystems/buildsystem_tests.t
@@ -634,7 +634,7 @@ override_dh_auto_build:
 	$(MAKE)
 %:
 	@dh_clean > /dev/null 2>&1
-	@+dh --buildsystem=makefile --after=dh_auto_configure --until=dh_auto_build $@ 2>/dev/null
+	@+dh $@ --buildsystem=makefile 2>/dev/null
 	@dh_clean > /dev/null 2>&1
 EOF
 test_is_parallel( do_rules_for_parallel("build", "include debian/rules"),
diff --git a/t/buildsystems/debian/compat b/t/buildsystems/debian/compat
index 7f8f011..ec63514 100644
--- a/t/buildsystems/debian/compat
+++ b/t/buildsystems/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/t/dh_install.t b/t/dh_install.t
index c266694..64e4df8 100755
--- a/t/dh_install.t
+++ b/t/dh_install.t
@@ -14,14 +14,14 @@ 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");
+system("DH_COMPAT=6 ./dh_install debian/tmp/usr/bin/foo 2>/dev/null");
 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");
+system("DH_COMPAT=6 ./dh_install --sourcedir=debian/tmp usr/bin/foo 2>/dev/null");
 ok(-e "debian/debhelper/usr/bin/foo");
 ok(! -e "debian/debhelper/usr/bin/bar");
 system("rm -rf debian/debhelper debian/tmp");

-- 
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