[lintian] 07/08: Move build-profiles related tests into its own test
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit c7ccd0e8567280058dc002e6c7c70148ca136ab8
Author: Niels Thykier <niels@thykier.net>
Date: Tue Mar 25 20:40:15 2014 +0100
Move build-profiles related tests into its own test
Since it requires dpkg 1.72.2, move it to its own test. Otherwise, we
would have to skip all of fields-build-depends-general on stable.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
.../debian/debian/control.in | 4 ----
t/tests/fields-build-depends-general/desc | 9 ---------
t/tests/fields-build-depends-general/tags | 8 --------
.../debian/debian/control.in | 8 +-------
t/tests/fields-build-profiles-general/desc | 16 ++++++++++++++++
t/tests/fields-build-profiles-general/tags | 8 ++++++++
6 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/t/tests/fields-build-depends-general/debian/debian/control.in b/t/tests/fields-build-depends-general/debian/debian/control.in
index 80222ef..4af62ec 100644
--- a/t/tests/fields-build-depends-general/debian/debian/control.in
+++ b/t/tests/fields-build-depends-general/debian/debian/control.in
@@ -8,13 +8,9 @@ Build-Depends: debhelper (>= 9), bd-conflict, revision-1 (>= 1.0-1),
xorg-dev, java-propose-classpath, python3.2-dev, foo [all],
bar [i386 any], baz [source i3!86], baz [i386 !amd64],
other-pkg [kfreebsd-any], yet-another [any-powerpc],
- big <profile.stage1>, bpfail1 <foobar>,
- bpfail2 <foo.bar>, bpfail3 <profile.bar>,
packaging-dev, libdb5.1++-dev, libdb5.1-java-dev
Build-Conflicts:
bd-conflict,
- dpkg-dev (>= 1.17.2),
- debhelper (>= 9.20140227)
Package: {$source}
Architecture: {$architecture}
diff --git a/t/tests/fields-build-depends-general/desc b/t/tests/fields-build-depends-general/desc
index 96c2918..d7c8552 100644
--- a/t/tests/fields-build-depends-general/desc
+++ b/t/tests/fields-build-depends-general/desc
@@ -15,14 +15,5 @@ Test-For:
conflicting-negation-in-source-relation
depends-on-build-essential-package-without-using-version
depends-on-packaging-dev
- invalid-arch-string-in-source-relation
- invalid-restriction-label-in-source-relation
- invalid-restriction-namespace-in-source-relation
- invalid-restriction-term-in-source-relation
ored-build-depends-on-obsolete-package
- restriction-list-with-debhelper-with-conflicting-debhelper-version
- restriction-list-with-debhelper-without-debhelper-version
- restriction-list-with-versioned-dpkg-dev-conflict
- restriction-list-without-versioned-dpkg-dev-dependency
- stageX-profile-used-but-no-binary-package-dropped
References: Debian Bug#540594, Debian Bug#551793
diff --git a/t/tests/fields-build-depends-general/tags b/t/tests/fields-build-depends-general/tags
index 5c70314..0c0222f 100644
--- a/t/tests/fields-build-depends-general/tags
+++ b/t/tests/fields-build-depends-general/tags
@@ -9,17 +9,9 @@ E: fields-build-depends-general source: depends-on-build-essential-package-witho
E: fields-build-depends-general source: invalid-arch-string-in-source-relation all [build-depends: foo [all]]
E: fields-build-depends-general source: invalid-arch-string-in-source-relation i3!86 [build-depends: baz [source i3!86]]
E: fields-build-depends-general source: invalid-arch-string-in-source-relation source [build-depends: baz [source i3!86]]
-E: fields-build-depends-general source: invalid-restriction-label-in-source-relation bar [build-depends: bpfail3 <profile.bar>]
-E: fields-build-depends-general source: invalid-restriction-namespace-in-source-relation foo [build-depends: bpfail2 <foo.bar>]
-E: fields-build-depends-general source: invalid-restriction-term-in-source-relation foobar [build-depends: bpfail1 <foobar>]
I: fields-build-depends-general source: build-depends-on-python-dev-with-no-arch-any
I: fields-build-depends-general source: ored-build-depends-on-obsolete-package build-depends: xlibmesa-gl-dev
W: fields-build-depends-general source: build-depends-on-1-revision build-depends: revision-1 (>= 1.0-1)
W: fields-build-depends-general source: build-depends-on-versioned-berkeley-db build-depends:libdb5.1++-dev
W: fields-build-depends-general source: build-depends-on-versioned-berkeley-db build-depends:libdb5.1-java-dev
W: fields-build-depends-general source: depends-on-packaging-dev build-depends
-W: fields-build-depends-general source: restriction-list-with-debhelper-with-conflicting-debhelper-version
-W: fields-build-depends-general source: restriction-list-with-debhelper-without-debhelper-version
-W: fields-build-depends-general source: restriction-list-with-versioned-dpkg-dev-conflict
-W: fields-build-depends-general source: restriction-list-without-versioned-dpkg-dev-dependency
-W: fields-build-depends-general source: stageX-profile-used-but-no-binary-package-dropped
diff --git a/t/tests/fields-build-depends-general/debian/debian/control.in b/t/tests/fields-build-profiles-general/debian/debian/control.in
similarity index 62%
copy from t/tests/fields-build-depends-general/debian/debian/control.in
copy to t/tests/fields-build-profiles-general/debian/debian/control.in
index 80222ef..5c232a2 100644
--- a/t/tests/fields-build-depends-general/debian/debian/control.in
+++ b/t/tests/fields-build-profiles-general/debian/debian/control.in
@@ -3,16 +3,10 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9), bd-conflict, revision-1 (>= 1.0-1),
- bash, make, x-dev, build-essential, new-package | xlibmesa-gl-dev,
- xorg-dev, java-propose-classpath, python3.2-dev, foo [all],
- bar [i386 any], baz [source i3!86], baz [i386 !amd64],
- other-pkg [kfreebsd-any], yet-another [any-powerpc],
+Build-Depends: debhelper (>= 9),
big <profile.stage1>, bpfail1 <foobar>,
bpfail2 <foo.bar>, bpfail3 <profile.bar>,
- packaging-dev, libdb5.1++-dev, libdb5.1-java-dev
Build-Conflicts:
- bd-conflict,
dpkg-dev (>= 1.17.2),
debhelper (>= 9.20140227)
diff --git a/t/tests/fields-build-profiles-general/desc b/t/tests/fields-build-profiles-general/desc
new file mode 100644
index 0000000..25117a5
--- /dev/null
+++ b/t/tests/fields-build-profiles-general/desc
@@ -0,0 +1,16 @@
+Testname: fields-build-profiles-general
+Sequence: 6000
+Version: 1.0
+Description: General tests for build profiles
+# Build-profiles requires dpkg 1.17.2
+Test-Depends: dpkg (>= 1.17.2~)
+Test-For:
+ invalid-restriction-label-in-source-relation
+ invalid-restriction-namespace-in-source-relation
+ invalid-restriction-term-in-source-relation
+ restriction-list-with-debhelper-with-conflicting-debhelper-version
+ restriction-list-with-debhelper-without-debhelper-version
+ restriction-list-with-versioned-dpkg-dev-conflict
+ restriction-list-without-versioned-dpkg-dev-dependency
+ stageX-profile-used-but-no-binary-package-dropped
+References: Debian Bug#540594, Debian Bug#551793
diff --git a/t/tests/fields-build-profiles-general/tags b/t/tests/fields-build-profiles-general/tags
new file mode 100644
index 0000000..b66cdfd
--- /dev/null
+++ b/t/tests/fields-build-profiles-general/tags
@@ -0,0 +1,8 @@
+E: fields-build-profiles-general source: invalid-restriction-label-in-source-relation bar [build-depends: bpfail3 <profile.bar>]
+E: fields-build-profiles-general source: invalid-restriction-namespace-in-source-relation foo [build-depends: bpfail2 <foo.bar>]
+E: fields-build-profiles-general source: invalid-restriction-term-in-source-relation foobar [build-depends: bpfail1 <foobar>]
+W: fields-build-profiles-general source: restriction-list-with-debhelper-with-conflicting-debhelper-version
+W: fields-build-profiles-general source: restriction-list-with-debhelper-without-debhelper-version
+W: fields-build-profiles-general source: restriction-list-with-versioned-dpkg-dev-conflict
+W: fields-build-profiles-general source: restriction-list-without-versioned-dpkg-dev-dependency
+W: fields-build-profiles-general source: stageX-profile-used-but-no-binary-package-dropped
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: