[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 08/09: Remake testsuite-control-syntax as hand-crafted test suite



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

nthykier pushed a commit to branch master
in repository lintian.

commit 394614834df539e61acc9c2a5e488701066a72b8
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 6 16:45:01 2016 +0000

    Remake testsuite-control-syntax as hand-crafted test suite
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 t/source/testsuite-control-syntax-error/Makefile       | 18 ++++++++++++++++++
 .../testsuite-control-syntax-error}/desc               |  2 +-
 t/source/testsuite-control-syntax-error/dsc.in.in      | 15 +++++++++++++++
 t/source/testsuite-control-syntax-error/tags           |  1 +
 .../testsuite-control-syntax/debian/debian/control.in  | 16 ----------------
 .../debian/debian/tests/control                        |  5 -----
 t/tests/testsuite-control-syntax/tags                  |  2 --
 7 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/t/source/testsuite-control-syntax-error/Makefile b/t/source/testsuite-control-syntax-error/Makefile
new file mode 100644
index 0000000..dfccd0c
--- /dev/null
+++ b/t/source/testsuite-control-syntax-error/Makefile
@@ -0,0 +1,18 @@
+name = testsuite-control-syntax-error
+dir  = $(name)-1.0
+
+all:
+	mkdir $(dir)
+	mkdir $(dir)/debian
+	cp changelog copyright control rules $(dir)/debian/
+	echo 7 > $(dir)/debian/compat
+	mkdir $(dir)/debian/source
+	echo 1.0 > $(dir)/debian/source/format
+	mkdir $(dir)/debian/tests
+	echo "Random file" > $(dir)/debian/tests/control
+	tar cfz $(name)_1.tar.gz $(dir)
+	subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
+
+clean:
+	rm -rf $(dir)
+	rm -f $(name)_*
diff --git a/t/tests/testsuite-control-syntax/desc b/t/source/testsuite-control-syntax-error/desc
similarity index 77%
rename from t/tests/testsuite-control-syntax/desc
rename to t/source/testsuite-control-syntax-error/desc
index 443331d..2ef78e2 100644
--- a/t/tests/testsuite-control-syntax/desc
+++ b/t/source/testsuite-control-syntax-error/desc
@@ -1,4 +1,4 @@
-Testname: testsuite-control-syntax
+Testname: testsuite-control-syntax-error
 Sequence: 6000
 Version: 1.0
 Description: Detection of syntax errors in autopkgtest control file
diff --git a/t/source/testsuite-control-syntax-error/dsc.in.in b/t/source/testsuite-control-syntax-error/dsc.in.in
new file mode 100644
index 0000000..839618f
--- /dev/null
+++ b/t/source/testsuite-control-syntax-error/dsc.in.in
@@ -0,0 +1,15 @@
+Format: 1.0
+Source: testsuite-control-syntax-error
+Binary: testsuite-control-syntax-error
+Architecture: all
+Version: 1
+Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Standards-Version: {$standards_version}
+Build-Depends: debhelper (>= 7)
+Testsuite: autopkgtest
+Checksums-Sha1:
+ @SHA1@ @SIZE@ testsuite-control-syntax-error_1.tar.gz
+Checksums-Sha256:
+ @SHA256@ @SIZE@ testsuite-control-syntax-error_1.tar.gz
+Files:
+ @MD5@ @SIZE@ testsuite-control-syntax-error_1.tar.gz
diff --git a/t/source/testsuite-control-syntax-error/tags b/t/source/testsuite-control-syntax-error/tags
new file mode 100644
index 0000000..3a7e362
--- /dev/null
+++ b/t/source/testsuite-control-syntax-error/tags
@@ -0,0 +1 @@
+W: testsuite-control-syntax-error source: syntax-error-in-debian-tests-control line 1: Cannot parse line "Random file"
diff --git a/t/tests/testsuite-control-syntax/debian/debian/control.in b/t/tests/testsuite-control-syntax/debian/debian/control.in
deleted file mode 100644
index f774b8d..0000000
--- a/t/tests/testsuite-control-syntax/debian/debian/control.in
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: {$source}
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9)
-XS-Testsuite: autopkgtest
-
-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/testsuite-control-syntax/debian/debian/tests/control b/t/tests/testsuite-control-syntax/debian/debian/tests/control
deleted file mode 100644
index e2f8d8b..0000000
--- a/t/tests/testsuite-control-syntax/debian/debian/tests/control
+++ /dev/null
@@ -1,5 +0,0 @@
-This file does not look like a Debian control file.
-
- at
-
- all
diff --git a/t/tests/testsuite-control-syntax/tags b/t/tests/testsuite-control-syntax/tags
deleted file mode 100644
index 12b28b0..0000000
--- a/t/tests/testsuite-control-syntax/tags
+++ /dev/null
@@ -1,2 +0,0 @@
-I: testsuite-control-syntax source: xs-testsuite-header-in-debian-control xs-testsuite
-W: testsuite-control-syntax source: syntax-error-in-debian-tests-control line 1: Cannot parse line "This file does not look like a Debian control file."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: