add a testcase for support of various build-dependency types

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 067cc6e8ad573eb9e8b59b7fca7cca3855818432..d5b68da84bad47c20c2140f2b911ec4db52c0af8 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -525,18 +525,20 @@ configdpkg() {
                local STATUSFILE="status-${BASENAME#*-}"
                if [ -f "${TESTDIRECTORY}/${STATUSFILE}" ]; then
                        cp "${TESTDIRECTORY}/${STATUSFILE}" rootdir/var/lib/dpkg/status
+                       # Add an empty line to the end if there is none
+                       if tail -1 rootdir/var/lib/dpkg/status | grep -q .; then
+                               echo >> rootdir/var/lib/dpkg/status
+                       fi
                else
                        echo -n > rootdir/var/lib/dpkg/status
                fi
        fi
        rm -f rootdir/etc/apt/apt.conf.d/00foreigndpkg
-       # if multi-arch make sure dpkg can detect itself as capable of it
-       if getarchitectures | grep -E -q '[^ ]+ [^ ]+'; then
-               if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
-                       # dpkg doesn't really check the version as long as it is fully installed,
-                       # but just to be sure we choose one above the required version
-                       insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
-               fi
+       # make sure dpkg can detect itself as capable of it
+       if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
+               # dpkg doesn't really check the version as long as it is fully installed,
+               # but just to be sure we choose one above the required version
+               insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
        fi
        if dpkg --assert-multi-arch >/dev/null 2>&1 ; then
                local ARCHS="$(getarchitectures)"