[lintian] 02/03: t: Tweak tests to avoid some redundancy
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit fe83c50ed0a95da56df0ff40ac117b61fb03e401
Author: Niels Thykier <niels@thykier.net>
Date: Sun Oct 22 10:15:30 2017 +0000
t: Tweak tests to avoid some redundancy
Signed-off-by: Niels Thykier <niels@thykier.net>
---
t/tests/binaries-golang/debian/debian/control.in | 15 ---------------
t/tests/cruft-updated-libtool/debian/debian/control.in | 15 ---------------
.../debian/debian/control.in | 15 ---------------
t/tests/files-python-general/debian/debian/control.in | 2 +-
.../debian/debian/control.in | 15 ---------------
t/tests/files-uses-perl4-libs-without-dep/desc | 1 +
.../patch-systems-empty-series/debian/debian/control.in | 15 ---------------
t/tests/patch-systems-empty-series/desc | 1 +
.../debian/debian/control.in | 15 ---------------
t/tests/patch-systems-no-readme-source/desc | 1 +
.../debian/debian/control.in | 15 ---------------
t/tests/patch-systems-quilt-description/desc | 1 +
.../debian/debian/control.in | 15 ---------------
t/tests/patch-systems-quilt-no-newline/desc | 1 +
.../debian/debian/control.in | 15 ---------------
t/tests/patch-systems-quilt-no-series/desc | 1 +
.../debian/debian/control.in | 2 +-
.../python-new-python2-package/debian/debian/control.in | 2 +-
t/tests/rules-build-dep-pattern/debian/debian/control.in | 15 ---------------
t/tests/rules-general/debian/debian/control.in | 2 +-
.../debian/debian/control.in | 15 ---------------
21 files changed, 10 insertions(+), 169 deletions(-)
diff --git a/t/tests/binaries-golang/debian/debian/control.in b/t/tests/binaries-golang/debian/debian/control.in
deleted file mode 100644
index c45ad2a..0000000
--- a/t/tests/binaries-golang/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: {$build_depends}, golang-go (>= 2:1.1.1-4)
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/cruft-updated-libtool/debian/debian/control.in b/t/tests/cruft-updated-libtool/debian/debian/control.in
deleted file mode 100644
index 5823d28..0000000
--- a/t/tests/cruft-updated-libtool/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: {$build_depends}, libtool
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/debhelper-dh-clean-k-deprecated/debian/debian/control.in b/t/tests/debhelper-dh-clean-k-deprecated/debian/debian/control.in
deleted file mode 100644
index ec804f3..0000000
--- a/t/tests/debhelper-dh-clean-k-deprecated/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/files-python-general/debian/debian/control.in b/t/tests/files-python-general/debian/debian/control.in
index e440e51..c4b88dd 100644
--- a/t/tests/files-python-general/debian/debian/control.in
+++ b/t/tests/files-python-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: optional
Section: python
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~)
+Build-Depends: {$build_depends}, dpkg-dev (>= 1.16.1~)
Package: python-kinterbasdb
Architecture: any
diff --git a/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in b/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in
deleted file mode 100644
index cd8d83e..0000000
--- a/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: {$build_depends}, perl
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/files-uses-perl4-libs-without-dep/desc b/t/tests/files-uses-perl4-libs-without-dep/desc
index 8f5cb80..e1bf303 100644
--- a/t/tests/files-uses-perl4-libs-without-dep/desc
+++ b/t/tests/files-uses-perl4-libs-without-dep/desc
@@ -1,4 +1,5 @@
Testname: files-uses-perl4-libs-without-dep
Version: 1.0
Description: Check that script-uses-perl4-libs-without-dep works (positive)
+Extra-Build-Depends: perl
Test-For: perl-module-uses-perl4-libs-without-dep
diff --git a/t/tests/patch-systems-empty-series/debian/debian/control.in b/t/tests/patch-systems-empty-series/debian/debian/control.in
deleted file mode 100644
index 5b004da..0000000
--- a/t/tests/patch-systems-empty-series/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: devel
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 9)
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlib:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/patch-systems-empty-series/desc b/t/tests/patch-systems-empty-series/desc
index 947cf06..e933d9a 100644
--- a/t/tests/patch-systems-empty-series/desc
+++ b/t/tests/patch-systems-empty-series/desc
@@ -1,5 +1,6 @@
Testname: patch-systems-empty-series
Version: 1.0
Description: Test for quilt patches with empty series
+Extra-Build-Depends: quilt
Test-Against: quilt-build-dep-but-no-series-file
References: Debian Bug #525005
diff --git a/t/tests/patch-systems-no-readme-source/debian/debian/control.in b/t/tests/patch-systems-no-readme-source/debian/debian/control.in
deleted file mode 100644
index 5b004da..0000000
--- a/t/tests/patch-systems-no-readme-source/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: devel
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 9)
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlib:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/patch-systems-no-readme-source/desc b/t/tests/patch-systems-no-readme-source/desc
index 163ed9a..b7f584f 100644
--- a/t/tests/patch-systems-no-readme-source/desc
+++ b/t/tests/patch-systems-no-readme-source/desc
@@ -1,5 +1,6 @@
Testname: patch-systems-no-readme-source
Version: 1.0
Description: Patch system with no README.source
+Extra-Build-Depends: quilt
Test-For: patch-system-but-no-source-readme
References: Debian Bug #537969
diff --git a/t/tests/patch-systems-quilt-description/debian/debian/control.in b/t/tests/patch-systems-quilt-description/debian/debian/control.in
deleted file mode 100644
index 5b004da..0000000
--- a/t/tests/patch-systems-quilt-description/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: devel
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 9)
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlib:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/patch-systems-quilt-description/desc b/t/tests/patch-systems-quilt-description/desc
index 3a07c41..e322bf2 100644
--- a/t/tests/patch-systems-quilt-description/desc
+++ b/t/tests/patch-systems-quilt-description/desc
@@ -1,6 +1,7 @@
Testname: patch-systems-quilt-description
Version: 1.0
Description: Test for quilt patches which do not have accompanying descriptions
+Extra-Build-Depends: quilt
Test-For: quilt-patch-missing-description
quilt-patch-using-template-description
References: Debian Bug #498892
diff --git a/t/tests/patch-systems-quilt-no-newline/debian/debian/control.in b/t/tests/patch-systems-quilt-no-newline/debian/debian/control.in
deleted file mode 100644
index 5b004da..0000000
--- a/t/tests/patch-systems-quilt-no-newline/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: devel
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 9)
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlib:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/patch-systems-quilt-no-newline/desc b/t/tests/patch-systems-quilt-no-newline/desc
index efb426d..817880b 100644
--- a/t/tests/patch-systems-quilt-no-newline/desc
+++ b/t/tests/patch-systems-quilt-no-newline/desc
@@ -1,4 +1,5 @@
Testname: patch-systems-quilt-no-newline
Version: 1.0
Description: Patch system with no debian/series that does not end with newline
+Extra-Build-Depends: quilt
Test-For: quilt-series-without-trailing-newline
diff --git a/t/tests/patch-systems-quilt-no-series/debian/debian/control.in b/t/tests/patch-systems-quilt-no-series/debian/debian/control.in
deleted file mode 100644
index 5b004da..0000000
--- a/t/tests/patch-systems-quilt-no-series/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: devel
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 9)
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlib:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/patch-systems-quilt-no-series/desc b/t/tests/patch-systems-quilt-no-series/desc
index 97d4e2e..e6b47d7 100644
--- a/t/tests/patch-systems-quilt-no-series/desc
+++ b/t/tests/patch-systems-quilt-no-series/desc
@@ -2,5 +2,6 @@ Testname: patch-systems-quilt-no-series
Version: 1.0-1
Type: non-native
Description: Test for quilt patches with no series
+Extra-Build-Depends: quilt
Test-For: quilt-build-dep-but-no-series-file
diff --git a/t/tests/python-build-depends-on-sphinx-alternative/debian/debian/control.in b/t/tests/python-build-depends-on-sphinx-alternative/debian/debian/control.in
index b335082..75f577d 100644
--- a/t/tests/python-build-depends-on-sphinx-alternative/debian/debian/control.in
+++ b/t/tests/python-build-depends-on-sphinx-alternative/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: optional
Section: python
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx
+Build-Depends: {$build_depends}, python-sphinx | python3-sphinx
Package: python3-{$source}
Architecture: all
diff --git a/t/tests/python-new-python2-package/debian/debian/control.in b/t/tests/python-new-python2-package/debian/debian/control.in
index 6ade66f..13db44c 100644
--- a/t/tests/python-new-python2-package/debian/debian/control.in
+++ b/t/tests/python-new-python2-package/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: optional
Section: python
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9)
+Build-Depends: {$build_depends}
Package: python-{$source}
Architecture: all
diff --git a/t/tests/rules-build-dep-pattern/debian/debian/control.in b/t/tests/rules-build-dep-pattern/debian/debian/control.in
deleted file mode 100644
index 3af5796..0000000
--- a/t/tests/rules-build-dep-pattern/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: {$build_depends}
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/rules-general/debian/debian/control.in b/t/tests/rules-general/debian/debian/control.in
index 1cc9086..12960dd 100644
--- a/t/tests/rules-general/debian/debian/control.in
+++ b/t/tests/rules-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: optional
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends-Indep: debhelper (>= 9), python
+Build-Depends-Indep: {$build_depends}, python
Package: {$source}
Architecture: {$architecture}
diff --git a/t/tests/testsuite-autopkgtest-missing/debian/debian/control.in b/t/tests/testsuite-autopkgtest-missing/debian/debian/control.in
deleted file mode 100644
index 82cded9..0000000
--- a/t/tests/testsuite-autopkgtest-missing/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: devel
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: {$build_depends}
-
-Package: {$source}
-Architecture: all
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: