test: Automatically discover CMake build directory

[apt.git] / test / integration / test-dpkg-assert-multi-arch

diff --git a/test/integration/test-dpkg-assert-multi-arch b/test/integration/test-dpkg-assert-multi-arch
index b3fbbf0eb7bfb291bfba981f54ccd6166b3432b6..678038cf2fe4bd6fa9329ecd1c6679bb862e99e7 100755 (executable)
--- a/test/integration/test-dpkg-assert-multi-arch
+++ b/test/integration/test-dpkg-assert-multi-arch
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'amd64' 'i386'
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
 


@@ -16,12 +16,15 @@ setupaptarchive
 
 testqualifier() {
        msgtest 'Test with' $1 'for correct qualifier mode' $2
 
 testqualifier() {
        msgtest 'Test with' $1 'for correct qualifier mode' $2

-       GIVEN="$(aptget install $1 -qq -o Debug::pkgDPkgPM=1 2>&1 | grep -v -- '--unpack' | sed -e 's/^.*--[^u][^ ]* \([^ ]*\).*$/\1/')"
+       #aptget install $1 -qq -o Debug::pkgDPkgPM=1 || true
+       aptget install $1 -qq -o Debug::pkgDPkgPM=1 -o Dpkg::ExplicitLastConfigure=1 > testqualifier.output 2>&1 || true
+       GIVEN="$(grep -v -- '--unpack' testqualifier.output | sed -ne 's/^.*--[rpc][^ ]* \([^ ]*\).*$/\1/p')"

        if [ "$GIVEN" = "$2" ]; then
                msgpass
        else
        if [ "$GIVEN" = "$2" ]; then
                msgpass
        else

-               echo
-               echo "$GIVEN"
+               cat >&2 testqualifier.output
+               echo >&2
+               echo >&2 "$GIVEN"

                msgfail
        fi
 }
                msgfail
        fi
 }