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

[SCM] Debian package checker branch, master, updated. 2.5.10-43-gae08361



The following commit has been merged in the master branch:
commit ae08361d509f965d1ae0d86e8d4f9629e7b91abf
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jul 14 12:49:44 2012 +0200

    t: Add test for tar-errors-from-data
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/t/COVERAGE b/t/COVERAGE
index 8908298..b5497a9 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,13 +1,11 @@
-Last generated 2012-07-13
-Coverage: 832/963 (86.40%), w. legacy tests: 932/963 (96.78%)
+Last generated 2012-07-14
+Coverage: 833/963 (86.50%), w. legacy tests: 933/963 (96.88%)
 
 The following tags are not tested by the test suite:
 
 binaries binary-file-compressed-with-upx
 binaries ocaml-custom-executable
 
-deb-format tar-errors-from-data
-
 debconf boolean-template-has-bogus-default
 debconf debconf-is-not-a-registry
 debconf duplicate-long-description-in-template
diff --git a/t/debs/deb-format-record-size/Makefile b/t/debs/deb-format-errors-tar/Makefile
similarity index 54%
copy from t/debs/deb-format-record-size/Makefile
copy to t/debs/deb-format-errors-tar/Makefile
index 6ef938d..b6545b3 100644
--- a/t/debs/deb-format-record-size/Makefile
+++ b/t/debs/deb-format-errors-tar/Makefile
@@ -1,20 +1,22 @@
-name = deb-format-record-size
+name = deb-format-errors-tar
 
-# Build the deb manully, since we need to fiddle with
-# with the record-size.
 all:
-	echo '2.0' > debian-binary
 	mkdir -p usr/share/doc/$(name)
 	install -m0644 copyright changelog usr/share/doc/$(name)
 	gzip -9 usr/share/doc/$(name)/changelog
-	tar --record-size=4096 -c -z -f data.tar.gz usr
-	chown 0:0 control
-	chmod 644 control
+
+	tar --xform 's,^,/,' -czf data.tar.gz usr/
+
 	md5sum usr/share/doc/$(name)/* > md5sums
-	tar --record-size=4096 -c -z -f control.tar.gz control md5sums
+
+	chmod 644 control md5sums
+	chown 0:0 control md5sums
+
+	echo '2.0' > debian-binary
+	tar czf control.tar.gz control md5sums
 	ar rc $(name).deb \
 	    debian-binary control.tar.gz data.tar.gz
 
 clean:
 	rm -f *.tar.gz *.deb md5sums debian-binary
-	rm -rf usr
+
diff --git a/t/debs/deb-format-errors-tar/desc b/t/debs/deb-format-errors-tar/desc
new file mode 100644
index 0000000..c40b737
--- /dev/null
+++ b/t/debs/deb-format-errors-tar/desc
@@ -0,0 +1,6 @@
+Testname: deb-format-errors-tar
+Sequence: 6000
+Version: 1.0
+Description: Test package emitting errors from tar
+Test-For: tar-errors-from-data
+
diff --git a/t/debs/deb-format-errors-tar/tags b/t/debs/deb-format-errors-tar/tags
new file mode 100644
index 0000000..be7ebec
--- /dev/null
+++ b/t/debs/deb-format-errors-tar/tags
@@ -0,0 +1,2 @@
+E: deb-format-errors-tar: tar-errors-from-data Removing leading `/' from member names
+E: deb-format-errors-tar: tar-errors-from-data Removing leading `/' from member names

-- 
Debian package checker


Reply to: