* apt-pkg/depcache.cc:

[ntk/apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 8a5973d..c09afcb 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -211,7 +211,7 @@ buildpackage() {
        fi
        local BUILT="$(dpkg-buildpackage -uc -us -a$ARCH 2> /dev/null)"
        local PKGS="$( echo "$BUILT" | grep '^dpkg-deb: building package' | cut -d'/' -f 2 | sed -e "s#'\.##")"
-       local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._-]*$')"
+       local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')"
        cd - > /dev/null
        for PKG in $PKGS; do
                echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist
@@ -499,3 +499,27 @@ testnopackage() {
        fi
        msgpass
 }
+
+testdpkginstalled() {
+       msgtest "Test for correctly installed package(s) with" "dpkg -l $*"
+       local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^i]' | wc -l)"
+       if [ "$PKGS" != 0 ]; then
+               echo $PKGS
+               dpkg -l $* | grep '^[a-z]'
+               msgfail
+               return 1
+       fi
+       msgpass
+}
+
+testdpkgnoninstalled() {
+       msgtest "Test for correctly non-installed package(s) with" "dpkg -l $*"
+       local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^u]' | wc -l)"
+       if [ "$PKGS" != 0 ]; then
+               echo
+               dpkg -l $* | grep '^[a-z]'
+               msgfail
+               return 1
+       fi
+       msgpass
+}