This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=f7493e8b8d2dea7ee6305d7e5386bf44fcb64b90 commit f7493e8b8d2dea7ee6305d7e5386bf44fcb64b90 Author: Guillem Jover <[email protected]> AuthorDate: Sat Aug 10 00:11:27 2013 +0200 t-deb-format: New test case --- Makefile | 1 + t-deb-format/.gitignore | 5 + t-deb-format/Makefile | 111 +++++++++++++++++++++ .../pkg-templ}/DEBIAN/control | 5 +- t-deb-format/pkg-templ/file-templ | 1 + 5 files changed, 120 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c4e5a7a01..b61f6da9e 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,7 @@ TESTS_PASS := TESTS_PASS += t-db TESTS_PASS += t-normal TESTS_PASS += t-field-priority +TESTS_PASS += t-deb-format TESTS_PASS += t-deb-split TESTS_PASS += t-option-dry-run TESTS_PASS += t-option-recursive diff --git a/t-deb-format/.gitignore b/t-deb-format/.gitignore new file mode 100644 index 000000000..9f33e90dc --- /dev/null +++ b/t-deb-format/.gitignore @@ -0,0 +1,5 @@ +_ignore +control.tar* +data.tar* +debian-binary +unknown diff --git a/t-deb-format/Makefile b/t-deb-format/Makefile new file mode 100644 index 000000000..2a7b04621 --- /dev/null +++ b/t-deb-format/Makefile @@ -0,0 +1,111 @@ +include ../Test.mk + +test-case: + # extract the base members + $(DPKG_DEB) -Znone -b pkg-templ + ar x pkg-templ.deb + gzip -c data.tar >data.tar.gz + xz -c data.tar >data.tar.xz + bzip2 -c data.tar >data.tar.bz2 + lzma -c data.tar >data.tar.lzma + touch _ignore + touch unknown + + # test debian-binary with 2.x versions + cp pkg-templ.deb pkg-version-2x.deb + echo 2.999 >debian-binary + ar rc pkg-version-2x.deb debian-binary + ar t pkg-version-2x.deb + $(DPKG_DEB) -I pkg-version-2x.deb + ar x pkg-templ.deb debian-binary + + # test debian-binary with extra lines + cp pkg-templ.deb pkg-magic-extra.deb + echo "extra line" >>debian-binary + ar rc pkg-magic-extra.deb debian-binary + ar t pkg-magic-extra.deb + $(DPKG_DEB) -I pkg-magic-extra.deb + ar x pkg-templ.deb debian-binary + + # test missing debian-binary member + cp pkg-templ.deb pkg-missing-magic.deb + ar d pkg-missing-magic.deb debian-binary + ar t pkg-missing-magic.deb + ! $(DPKG_DEB) -I pkg-missing-magic.deb + + # test missing control member + cp pkg-templ.deb pkg-missing-control.deb + ar d pkg-missing-control.deb control.tar.gz + ar t pkg-missing-control.deb + ! $(DPKG_DEB) -I pkg-missing-control.deb + + # test missing data member + cp pkg-templ.deb pkg-missing-data.deb + ar d pkg-missing-data.deb data.tar + ar t pkg-missing-data.deb + ! $(DPKG_DEB) -c pkg-missing-data.deb + + # test mixed member (index 1) + cp pkg-templ.deb pkg-mixed-1-member.deb + ar ra debian-binary pkg-mixed-1-member.deb unknown + ar t pkg-mixed-1-member.deb + ! $(DPKG_DEB) -I pkg-mixed-1-member.deb + + # test mixed member (index 2) + cp pkg-templ.deb pkg-mixed-2-member.deb + ar ra control.tar.gz pkg-mixed-2-member.deb unknown + ar t pkg-mixed-2-member.deb + ! $(DPKG_DEB) -c pkg-mixed-2-member.deb + + # test swapped control and data members + cp pkg-templ.deb pkg-swap-members.deb + ar ma data.tar pkg-swap-members.deb control.tar.gz + ar t pkg-swap-members.deb + ! $(DPKG_DEB) -I pkg-swap-members.deb + + # test extra member + cp pkg-templ.deb pkg-extra-member.deb + ar q pkg-extra-member.deb unknown + ar t pkg-extra-member.deb + $(DPKG_DEB) -I pkg-extra-member.deb + + # test _ member + cp pkg-templ.deb pkg-under-member.deb + ar ra debian-binary pkg-under-member.deb _ignore + ar t pkg-under-member.deb + $(DPKG_DEB) -I pkg-under-member.deb + + # test data.tar.bad member + dd if=/dev/zero of=data.tar.bad bs=1K count=4 + ar rc pkg-data-bad.deb debian-binary control.tar.gz data.tar.bad + ar t pkg-data-bad.deb + ! $(DPKG_DEB) -c pkg-data-bad.deb + + # test data.tar member + ar rc pkg-data-none.deb debian-binary control.tar.gz data.tar + ar t pkg-data-none.deb + $(DPKG_DEB) -c pkg-data-none.deb + + # test data.tar.gz member + ar rc pkg-data-gz.deb debian-binary control.tar.gz data.tar.gz + ar t pkg-data-gz.deb + $(DPKG_DEB) -c pkg-data-gz.deb + + # test data.tar.xz member + ar rc pkg-data-xz.deb debian-binary control.tar.gz data.tar.xz + ar t pkg-data-xz.deb + $(DPKG_DEB) -c pkg-data-xz.deb + + # test data.tar.bz2 member + ar rc pkg-data-bz2.deb debian-binary control.tar.gz data.tar.bz2 + ar t pkg-data-bz2.deb + $(DPKG_DEB) -c pkg-data-bz2.deb + + # test data.tar.lzma member + ar rc pkg-data-lzma.deb debian-binary control.tar.gz data.tar.lzma + ar t pkg-data-lzma.deb + $(DPKG_DEB) -c pkg-data-lzma.deb + +test-clean: + $(RM) _ignore unknown debian-binary control.tar* data.tar* + $(RM) pkg-*.deb diff --git a/t-disappear-depended/pkg-disappear/DEBIAN/control b/t-deb-format/pkg-templ/DEBIAN/control similarity index 63% copy from t-disappear-depended/pkg-disappear/DEBIAN/control copy to t-deb-format/pkg-templ/DEBIAN/control index 78c2a1723..6eb199518 100644 --- a/t-disappear-depended/pkg-disappear/DEBIAN/control +++ b/t-deb-format/pkg-templ/DEBIAN/control @@ -1,8 +1,7 @@ -Package: pkg-disappear +Package: pkg-deb-format Version: 0.0-1 Section: test Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: all -Description: test package - disappear - +Description: test package - deb format support diff --git a/t-deb-format/pkg-templ/file-templ b/t-deb-format/pkg-templ/file-templ new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/t-deb-format/pkg-templ/file-templ @@ -0,0 +1 @@ +test -- Dpkg.Org's dpkg
