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=c8bfb5d2d5d5998dfc1630d1a1da4f08c3a36fd2 commit c8bfb5d2d5d5998dfc1630d1a1da4f08c3a36fd2 Author: Guillem Jover <[email protected]> AuthorDate: Fri Aug 9 22:29:11 2013 +0200 t-lfs: Rename to t-deb-lfs Rename test packages and test files to be more consistent. --- Makefile | 4 ++-- {t-lfs => t-deb-lfs}/Makefile | 20 ++++++++++---------- {t-lfs => t-deb-lfs}/pkg-lfs/DEBIAN/control | 0 .../pkg-sfs}/DEBIAN/control | 5 ++--- t-lfs/pkg-tfs/DEBIAN/control | 7 ------- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index cc26d0894..e2630fd2c 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ # # Dpkg functional testsuite (kind of) # -# Copyright © 2008-2012 Guillem Jover <[email protected]> +# Copyright © 2008-2013 Guillem Jover <[email protected]> # -include .pkg-tests.conf TESTS_MANUAL := -TESTS_MANUAL += t-lfs +TESTS_MANUAL += t-deb-lfs TESTS_MANUAL += t-conffile-prompt TESTS_FAIL := diff --git a/t-lfs/Makefile b/t-deb-lfs/Makefile similarity index 54% rename from t-lfs/Makefile rename to t-deb-lfs/Makefile index 5ffb70882..4fe78fd92 100644 --- a/t-lfs/Makefile +++ b/t-deb-lfs/Makefile @@ -1,35 +1,35 @@ -PKG_TFS := pkg-tfs +PKG_SFS := pkg-sfs PKG_LFS := pkg-lfs -TESTS_DEB := $(PKG_LFS) $(PKG_TFS) +TESTS_DEB := $(PKG_LFS) $(PKG_SFS) # This will test both the ar archive and the tar LFS support. DPKG_DEB_OPTIONS = -Znone include ../Test.mk -$(PKG_LFS)/big-file: +$(PKG_LFS)/large-file: dd if=/dev/zero of=$@ bs=1K count=5M $(PKG_TFS)/small-file: yes | dd of=$@ bs=1K count=4 -build-hook: $(PKG_LFS)/big-file $(PKG_TFS)/small-file +build-hook: $(PKG_LFS)/large-file $(PKG_TFS)/small-file clean-hook: - $(RM) $(PKG_LFS)/big-file $(PKG_TFS)/small-file + $(RM) $(PKG_LFS)/large-file $(PKG_TFS)/small-file test-case: - # test Tiny File Support packages - $(DPKG_INSTALL) pkg-tfs.deb - test "`$(PKG_STATUS) pkg-tfs`" = "install ok installed" + # test Small File Support packages + $(DPKG_INSTALL) pkg-sfs.deb + test "`$(PKG_STATUS) pkg-sfs`" = "install ok installed" test "`stat -c%s /small-file`" = "4096" # test Large File Support packages $(DPKG_INSTALL) pkg-lfs.deb test "`$(PKG_STATUS) pkg-lfs`" = "install ok installed" - test "`stat -c%s /big-file`" = "5368709120" + test "`stat -c%s /large-file`" = "5368709120" test-clean: - $(DPKG_PURGE) pkg-tfs + $(DPKG_PURGE) pkg-sfs $(DPKG_PURGE) pkg-lfs diff --git a/t-lfs/pkg-lfs/DEBIAN/control b/t-deb-lfs/pkg-lfs/DEBIAN/control similarity index 100% rename from t-lfs/pkg-lfs/DEBIAN/control rename to t-deb-lfs/pkg-lfs/DEBIAN/control diff --git a/t-disappear/pkg-disappear-0/DEBIAN/control b/t-deb-lfs/pkg-sfs/DEBIAN/control similarity index 65% copy from t-disappear/pkg-disappear-0/DEBIAN/control copy to t-deb-lfs/pkg-sfs/DEBIAN/control index 78c2a1723..2ccee74a4 100644 --- a/t-disappear/pkg-disappear-0/DEBIAN/control +++ b/t-deb-lfs/pkg-sfs/DEBIAN/control @@ -1,8 +1,7 @@ -Package: pkg-disappear +Package: pkg-sfs Version: 0.0-1 Section: test Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: all -Description: test package - disappear - +Description: test package - small file support diff --git a/t-lfs/pkg-tfs/DEBIAN/control b/t-lfs/pkg-tfs/DEBIAN/control deleted file mode 100644 index c723bccda..000000000 --- a/t-lfs/pkg-tfs/DEBIAN/control +++ /dev/null @@ -1,7 +0,0 @@ -Package: pkg-tfs -Version: 0.0-1 -Section: test -Priority: extra -Maintainer: Dpkg Developers <[email protected]> -Architecture: all -Description: test package - tiny file support -- Dpkg.Org's dpkg
