[lintian] 01/02: t/source: Stop hardcoding debhelper compat levels in tests
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit ce549ce9a955b281b51e593b8c48b87e3a1ae41c
Author: Niels Thykier <niels@thykier.net>
Date: Sun Oct 16 14:38:09 2016 +0000
t/source: Stop hardcoding debhelper compat levels in tests
Signed-off-by: Niels Thykier <niels@thykier.net>
---
t/runtests | 10 ++++++++--
t/source/changelog-file-symlink/Makefile | 2 +-
t/source/control-field-traversal-1/Makefile | 2 +-
t/source/control-field-traversal-2/Makefile | 2 +-
t/source/control-field-traversal-3/Makefile | 2 +-
t/source/control-file-duplicate-field/Makefile | 2 +-
t/source/control-file-missing-separator/Makefile | 2 +-
t/source/control-file-syntax-error/Makefile | 2 +-
t/source/cruft-ancient-file/Makefile | 2 +-
t/source/debconf-traversal/Makefile | 2 +-
t/source/debian-source-dir-traversal-1/Makefile | 2 +-
t/source/debian-source-dir-unknown-source-format/Makefile | 2 +-
t/source/debian-symlink/Makefile | 2 +-
t/source/fields-src-bad-version/Makefile | 2 +-
t/source/fields-src-fields-filename/Makefile | 2 +-
t/source/magic-architecture-srcpkg-ok/Makefile | 2 +-
t/source/magic-architecture-srcpkg-wrong/Makefile | 2 +-
t/source/package-version-0/Makefile | 2 +-
t/source/testsuite-control-missing-test-field/Makefile | 2 +-
t/source/testsuite-control-not-file/Makefile | 2 +-
t/source/testsuite-control-syntax-error/Makefile | 2 +-
t/source/testsuite-inconsistent-field/Makefile | 2 +-
t/source/unpack-srcpkg-dot-dir/Makefile | 2 +-
t/source/unpack-srcpkg-dot-subdir/Makefile | 2 +-
t/source/unpack-srcpkg-no-subdir/Makefile | 2 +-
t/source/unpack-srcpkg-xz/Makefile | 2 +-
26 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/t/runtests b/t/runtests
index 2a591dd..61f3aad 100755
--- a/t/runtests
+++ b/t/runtests
@@ -618,8 +618,14 @@ sub generic_test_runner {
}
$test_state->progress('building');
- my $res= chdir_runcmd($targetdir, ['fakeroot', 'make'],
- "../build.$testname");
+ my $res= chdir_runcmd(
+ $targetdir,
+ [
+ 'fakeroot', 'make',
+ "DEFAULT_DH_COMPAT=$testdata->{dh_compat_level}"
+ ],
+ "../build.$testname"
+ );
if ($res) {
$test_state->dump_log("${RUNDIR}/${suite}/build.${testname}")
if $DUMP_LOGS;
diff --git a/t/source/changelog-file-symlink/Makefile b/t/source/changelog-file-symlink/Makefile
index 1fe3d36..931b1df 100644
--- a/t/source/changelog-file-symlink/Makefile
+++ b/t/source/changelog-file-symlink/Makefile
@@ -7,7 +7,7 @@ all:
cp changelog copyright control rules $(dir)/debian/
mv $(dir)/debian/changelog $(dir)/debian/changelog.old
ln -s changelog.old $(dir)/debian/changelog
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo '3.0 (quilt)' > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/control-field-traversal-1/Makefile b/t/source/control-field-traversal-1/Makefile
index f87ee69..671b5d6 100644
--- a/t/source/control-field-traversal-1/Makefile
+++ b/t/source/control-field-traversal-1/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/control-field-traversal-2/Makefile b/t/source/control-field-traversal-2/Makefile
index fa137c1..b2062fc 100644
--- a/t/source/control-field-traversal-2/Makefile
+++ b/t/source/control-field-traversal-2/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/control-field-traversal-3/Makefile b/t/source/control-field-traversal-3/Makefile
index d11fe9e..610d121 100644
--- a/t/source/control-field-traversal-3/Makefile
+++ b/t/source/control-field-traversal-3/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/control-file-duplicate-field/Makefile b/t/source/control-file-duplicate-field/Makefile
index 690b7ff..f9b5b8f 100644
--- a/t/source/control-file-duplicate-field/Makefile
+++ b/t/source/control-file-duplicate-field/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/control-file-missing-separator/Makefile b/t/source/control-file-missing-separator/Makefile
index 454afec..2fd3dfe 100644
--- a/t/source/control-file-missing-separator/Makefile
+++ b/t/source/control-file-missing-separator/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/control-file-syntax-error/Makefile b/t/source/control-file-syntax-error/Makefile
index 4ae7d3b..3e08ee0 100644
--- a/t/source/control-file-syntax-error/Makefile
+++ b/t/source/control-file-syntax-error/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/cruft-ancient-file/Makefile b/t/source/cruft-ancient-file/Makefile
index 284c123..584a18f 100644
--- a/t/source/cruft-ancient-file/Makefile
+++ b/t/source/cruft-ancient-file/Makefile
@@ -8,7 +8,7 @@ all:
tar -c -f $(name)_1.0.orig.tar.gz -z $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
echo '# foo' > $(dir)/debian/watch
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
diff --git a/t/source/debconf-traversal/Makefile b/t/source/debconf-traversal/Makefile
index fd20c3a..91c800a 100644
--- a/t/source/debconf-traversal/Makefile
+++ b/t/source/debconf-traversal/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/debian-source-dir-traversal-1/Makefile b/t/source/debian-source-dir-traversal-1/Makefile
index dfcf94b..e8ffe1e 100644
--- a/t/source/debian-source-dir-traversal-1/Makefile
+++ b/t/source/debian-source-dir-traversal-1/Makefile
@@ -7,7 +7,7 @@ all:
cp changelog copyright control rules $(dir)/debian/
# prevent patch-system-but-no-source-readme
echo "Hallo World" > $(dir)/debian/README.source
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
# link to index file for the lab entry
diff --git a/t/source/debian-source-dir-unknown-source-format/Makefile b/t/source/debian-source-dir-unknown-source-format/Makefile
index 0e0a2c3..4b20c5c 100644
--- a/t/source/debian-source-dir-unknown-source-format/Makefile
+++ b/t/source/debian-source-dir-unknown-source-format/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo "3.0 (unknown-format)" > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/debian-symlink/Makefile b/t/source/debian-symlink/Makefile
index 9093116..ffa2799 100644
--- a/t/source/debian-symlink/Makefile
+++ b/t/source/debian-symlink/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
ln -s . $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/fields-src-bad-version/Makefile b/t/source/fields-src-bad-version/Makefile
index 4ae7d3b..3e08ee0 100644
--- a/t/source/fields-src-bad-version/Makefile
+++ b/t/source/fields-src-bad-version/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
diff --git a/t/source/fields-src-fields-filename/Makefile b/t/source/fields-src-fields-filename/Makefile
index 4acfab0..7fff799 100644
--- a/t/source/fields-src-fields-filename/Makefile
+++ b/t/source/fields-src-fields-filename/Makefile
@@ -7,7 +7,7 @@ all:
mkdir $(dir)/debian
mkdir $(dir)/debian/source
echo "1.0" > $(dir)/debian/source/format
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
cp changelog copyright control rules $(dir)/debian/
tar cfz $(dsc)_1.tar.gz $(dir)
subst-dsc $(dsc)_1.tar.gz < dsc.in > $(dsc)_1.dsc
diff --git a/t/source/magic-architecture-srcpkg-ok/Makefile b/t/source/magic-architecture-srcpkg-ok/Makefile
index e40fb6d..90330cd 100644
--- a/t/source/magic-architecture-srcpkg-ok/Makefile
+++ b/t/source/magic-architecture-srcpkg-ok/Makefile
@@ -7,7 +7,7 @@ all:
tar -c -f $(name)_1.0.orig.tar.gz -z $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
echo '# foo' > $(dir)/debian/watch
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
diff --git a/t/source/magic-architecture-srcpkg-wrong/Makefile b/t/source/magic-architecture-srcpkg-wrong/Makefile
index b1d7dc6..d680a0c 100644
--- a/t/source/magic-architecture-srcpkg-wrong/Makefile
+++ b/t/source/magic-architecture-srcpkg-wrong/Makefile
@@ -7,7 +7,7 @@ all:
tar -c -f $(name)_1.0.orig.tar.gz -z $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
echo '# foo' > $(dir)/debian/watch
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
diff --git a/t/source/package-version-0/Makefile b/t/source/package-version-0/Makefile
index 8c41539..f909603 100644
--- a/t/source/package-version-0/Makefile
+++ b/t/source/package-version-0/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
dpkg-source -sn -b $(dir)
diff --git a/t/source/testsuite-control-missing-test-field/Makefile b/t/source/testsuite-control-missing-test-field/Makefile
index c660a36..6d247ce 100644
--- a/t/source/testsuite-control-missing-test-field/Makefile
+++ b/t/source/testsuite-control-missing-test-field/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
mkdir $(dir)/debian/tests
diff --git a/t/source/testsuite-control-not-file/Makefile b/t/source/testsuite-control-not-file/Makefile
index 52e436a..e4b7c73 100644
--- a/t/source/testsuite-control-not-file/Makefile
+++ b/t/source/testsuite-control-not-file/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
mkdir $(dir)/debian/tests
diff --git a/t/source/testsuite-control-syntax-error/Makefile b/t/source/testsuite-control-syntax-error/Makefile
index dfccd0c..e205d1e 100644
--- a/t/source/testsuite-control-syntax-error/Makefile
+++ b/t/source/testsuite-control-syntax-error/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
mkdir $(dir)/debian/tests
diff --git a/t/source/testsuite-inconsistent-field/Makefile b/t/source/testsuite-inconsistent-field/Makefile
index 121df19..17e2ca9 100644
--- a/t/source/testsuite-inconsistent-field/Makefile
+++ b/t/source/testsuite-inconsistent-field/Makefile
@@ -5,7 +5,7 @@ all:
mkdir $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
mkdir $(dir)/debian/tests
diff --git a/t/source/unpack-srcpkg-dot-dir/Makefile b/t/source/unpack-srcpkg-dot-dir/Makefile
index 256cfde..a7b81b2 100644
--- a/t/source/unpack-srcpkg-dot-dir/Makefile
+++ b/t/source/unpack-srcpkg-dot-dir/Makefile
@@ -9,7 +9,7 @@ all:
mkdir -p $(dir)/debian
cp README foo.c foo.h $(dir)
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
echo > $(dir)/debian/watch
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
diff --git a/t/source/unpack-srcpkg-dot-subdir/Makefile b/t/source/unpack-srcpkg-dot-subdir/Makefile
index f3dd118..ccbef43 100644
--- a/t/source/unpack-srcpkg-dot-subdir/Makefile
+++ b/t/source/unpack-srcpkg-dot-subdir/Makefile
@@ -8,7 +8,7 @@ all:
tar -c -z -f $(name)_1.0.orig.tar.gz ./$(name)
mkdir -p $(name)/debian
cp changelog copyright control rules $(name)/debian/
- echo 7 > $(name)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(name)/debian/compat
echo > $(name)/debian/watch
mkdir $(name)/debian/source
echo 1.0 > $(name)/debian/source/format
diff --git a/t/source/unpack-srcpkg-no-subdir/Makefile b/t/source/unpack-srcpkg-no-subdir/Makefile
index a445708..c8da8dd 100644
--- a/t/source/unpack-srcpkg-no-subdir/Makefile
+++ b/t/source/unpack-srcpkg-no-subdir/Makefile
@@ -9,7 +9,7 @@ all:
mkdir -p $(dir)/debian
cp README foo.c foo.h $(dir)
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
echo > $(dir)/debian/watch
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
diff --git a/t/source/unpack-srcpkg-xz/Makefile b/t/source/unpack-srcpkg-xz/Makefile
index 566deba..f11b819 100644
--- a/t/source/unpack-srcpkg-xz/Makefile
+++ b/t/source/unpack-srcpkg-xz/Makefile
@@ -7,7 +7,7 @@ all:
tar -c -f $(name)_1.0.orig.tar.xz --xz $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
- echo 7 > $(dir)/debian/compat
+ echo $(DEFAULT_DH_COMPAT) > $(dir)/debian/compat
touch $(dir)/debian/watch
mkdir $(dir)/debian/source
echo '3.0 (quilt)' > $(dir)/debian/source/format
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: