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=beed1d881ea2e7e9c1fd4248db843d0b2e4d51ce commit beed1d881ea2e7e9c1fd4248db843d0b2e4d51ce Author: Guillem Jover <[email protected]> AuthorDate: Fri Mar 18 03:12:05 2011 +0200 New t-depends-versioned test-case --- Makefile | 1 + t-depends-versioned/Makefile | 61 ++++++++++++++++++++++ t-depends-versioned/pkg-depends-eq/DEBIAN/control | 8 +++ t-depends-versioned/pkg-depends-ge/DEBIAN/control | 8 +++ t-depends-versioned/pkg-depends-gt/DEBIAN/control | 8 +++ t-depends-versioned/pkg-depends-le/DEBIAN/control | 8 +++ t-depends-versioned/pkg-depends-lt/DEBIAN/control | 8 +++ .../pkg-version-1}/DEBIAN/control | 6 +-- t-depends-versioned/pkg-version-2/DEBIAN/control | 7 +++ t-depends-versioned/pkg-version-3/DEBIAN/control | 7 +++ 10 files changed, 118 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d9e4e3b8a..3ba194b3a 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ TESTS_PASS := \ t-unpack-device \ t-filtering \ t-depends \ + t-depends-versioned \ t-depends-provides \ t-disappear \ t-disappear-empty \ diff --git a/t-depends-versioned/Makefile b/t-depends-versioned/Makefile new file mode 100644 index 000000000..7dfd9031b --- /dev/null +++ b/t-depends-versioned/Makefile @@ -0,0 +1,61 @@ +TESTS_DEB := \ + pkg-version-1 pkg-version-2 pkg-version-3 pkg-depends-eq \ + pkg-depends-lt pkg-depends-le pkg-depends-ge pkg-depends-gt + +include ../Test.mk + +define purge-all +$(DPKG_PURGE) pkg-depends-lt +$(DPKG_PURGE) pkg-depends-le +$(DPKG_PURGE) pkg-depends-eq +$(DPKG_PURGE) pkg-depends-ge +$(DPKG_PURGE) pkg-depends-gt +endef + +test-case: + $(purge-all) + + # The dependency is not present, fail + ! $(DPKG_INSTALL) pkg-depends-lt.deb + ! $(DPKG_INSTALL) pkg-depends-le.deb + ! $(DPKG_INSTALL) pkg-depends-eq.deb + ! $(DPKG_INSTALL) pkg-depends-ge.deb + ! $(DPKG_INSTALL) pkg-depends-gt.deb + + # Install the package v1 + $(DPKG_INSTALL) pkg-version-1.deb + $(DPKG_INSTALL) pkg-depends-lt.deb + $(DPKG_INSTALL) pkg-depends-le.deb + ! $(DPKG_INSTALL) pkg-depends-eq.deb + ! $(DPKG_INSTALL) pkg-depends-ge.deb + ! $(DPKG_INSTALL) pkg-depends-gt.deb + + $(purge-all) + + # Install the package v2 + $(DPKG_INSTALL) pkg-version-2.deb + ! $(DPKG_INSTALL) pkg-depends-lt.deb + $(DPKG_INSTALL) pkg-depends-le.deb + $(DPKG_INSTALL) pkg-depends-eq.deb + $(DPKG_INSTALL) pkg-depends-ge.deb + ! $(DPKG_INSTALL) pkg-depends-gt.deb + + $(purge-all) + + # Install the package v3 + $(DPKG_INSTALL) pkg-version-3.deb + ! $(DPKG_INSTALL) pkg-depends-lt.deb + ! $(DPKG_INSTALL) pkg-depends-le.deb + ! $(DPKG_INSTALL) pkg-depends-eq.deb + $(DPKG_INSTALL) pkg-depends-ge.deb + $(DPKG_INSTALL) pkg-depends-gt.deb + + $(purge-all) + +test-clean: + -$(DPKG_PURGE) pkg-depends-lt + -$(DPKG_PURGE) pkg-depends-le + -$(DPKG_PURGE) pkg-depends-eq + -$(DPKG_PURGE) pkg-depends-ge + -$(DPKG_PURGE) pkg-depends-gt + -$(DPKG_PURGE) pkg-version diff --git a/t-depends-versioned/pkg-depends-eq/DEBIAN/control b/t-depends-versioned/pkg-depends-eq/DEBIAN/control new file mode 100644 index 000000000..457cbc430 --- /dev/null +++ b/t-depends-versioned/pkg-depends-eq/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-depends-eq +Version: 0 +Section: test +Priority: extra +Maintainer: Guillem Jover <[email protected]> +Architecture: all +Depends: pkg-version (= 2) +Description: test package - package depending on an exact version diff --git a/t-depends-versioned/pkg-depends-ge/DEBIAN/control b/t-depends-versioned/pkg-depends-ge/DEBIAN/control new file mode 100644 index 000000000..b1ed2366b --- /dev/null +++ b/t-depends-versioned/pkg-depends-ge/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-depends-ge +Version: 0 +Section: test +Priority: extra +Maintainer: Guillem Jover <[email protected]> +Architecture: all +Depends: pkg-version (>= 2) +Description: test package - package depending on a greater or equal version diff --git a/t-depends-versioned/pkg-depends-gt/DEBIAN/control b/t-depends-versioned/pkg-depends-gt/DEBIAN/control new file mode 100644 index 000000000..85a42759f --- /dev/null +++ b/t-depends-versioned/pkg-depends-gt/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-depends-gt +Version: 0 +Section: test +Priority: extra +Maintainer: Guillem Jover <[email protected]> +Architecture: all +Depends: pkg-version (>> 2) +Description: test package - package depending on a greater than version diff --git a/t-depends-versioned/pkg-depends-le/DEBIAN/control b/t-depends-versioned/pkg-depends-le/DEBIAN/control new file mode 100644 index 000000000..179713ba2 --- /dev/null +++ b/t-depends-versioned/pkg-depends-le/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-depends-le +Version: 0 +Section: test +Priority: extra +Maintainer: Guillem Jover <[email protected]> +Architecture: all +Depends: pkg-version (<= 2) +Description: test package - package depending on an earlier or equal version diff --git a/t-depends-versioned/pkg-depends-lt/DEBIAN/control b/t-depends-versioned/pkg-depends-lt/DEBIAN/control new file mode 100644 index 000000000..6e484c280 --- /dev/null +++ b/t-depends-versioned/pkg-depends-lt/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-depends-lt +Version: 0 +Section: test +Priority: extra +Maintainer: Guillem Jover <[email protected]> +Architecture: all +Depends: pkg-version (<< 2) +Description: test package - package depending on an earlier than version diff --git a/t-conffile-forceask/pkg-conff-forceask-1/DEBIAN/control b/t-depends-versioned/pkg-version-1/DEBIAN/control similarity index 53% copy from t-conffile-forceask/pkg-conff-forceask-1/DEBIAN/control copy to t-depends-versioned/pkg-version-1/DEBIAN/control index 77014afd6..c886271d6 100644 --- a/t-conffile-forceask/pkg-conff-forceask-1/DEBIAN/control +++ b/t-depends-versioned/pkg-version-1/DEBIAN/control @@ -1,9 +1,7 @@ -Package: pkg-conff-forceask +Package: pkg-version Version: 1 Section: test Priority: extra Maintainer: Guillem Jover <[email protected]> Architecture: all -Description: test package - force-confask behaviour - Debbug: ?? - +Description: test package - real package to depend on a specific version diff --git a/t-depends-versioned/pkg-version-2/DEBIAN/control b/t-depends-versioned/pkg-version-2/DEBIAN/control new file mode 100644 index 000000000..9fec62505 --- /dev/null +++ b/t-depends-versioned/pkg-version-2/DEBIAN/control @@ -0,0 +1,7 @@ +Package: pkg-version +Version: 2 +Section: test +Priority: extra +Maintainer: Guillem Jover <[email protected]> +Architecture: all +Description: test package - real package to depend on a specific version diff --git a/t-depends-versioned/pkg-version-3/DEBIAN/control b/t-depends-versioned/pkg-version-3/DEBIAN/control new file mode 100644 index 000000000..10dec2756 --- /dev/null +++ b/t-depends-versioned/pkg-version-3/DEBIAN/control @@ -0,0 +1,7 @@ +Package: pkg-version +Version: 3 +Section: test +Priority: extra +Maintainer: Guillem Jover <[email protected]> +Architecture: all +Description: test package - real package to depend on a specific version -- Dpkg.Org's dpkg
