diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-07-15 14:15:59 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-07-15 14:28:14 +0200 |
| commit | f883d2c3675eae2700e4cd1532c1a236cae69a4e (patch) | |
| tree | 96aa56c0aca1e6321330b7f0dd946c445613bfe6 | |
| parent | b8c465aa89406d6bba17e8ecf04710eae2c71d08 (diff) | |
Use native arch in test-external-installation-planner-protocol
Hardcoding amd64 broke the tests.
| -rwxr-xr-x | test/integration/test-external-installation-planner-protocol | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/test/integration/test-external-installation-planner-protocol b/test/integration/test-external-installation-planner-protocol index bd3c99c32..c499c53af 100755 --- a/test/integration/test-external-installation-planner-protocol +++ b/test/integration/test-external-installation-planner-protocol @@ -2,17 +2,18 @@ set -e TESTDIR="$(readlink -f "$(dirname "$0")")" +NATIVE="$(command dpkg --print-architecture)" . "$TESTDIR/framework" setupenvironment -configarchitecture 'amd64' +configarchitecture "${NATIVE}" -buildsimplenativepackage 'libfoo' 'amd64' '3' 'experimental' 'Multi-Arch: same' +buildsimplenativepackage 'libfoo' "${NATIVE}" '3' 'experimental' 'Multi-Arch: same' buildsimplenativepackage 'foo' 'all' '3' 'experimental' 'Depends: newstuff' -buildsimplenativepackage 'foo' 'all' '2' 'unstable' 'Depends: libfoo:amd64, stuff +buildsimplenativepackage 'foo' 'all' '2' 'unstable' "Depends: libfoo:$NATIVE, stuff Conflicts: bar, libfoo:i386 -Recommends: unrelated' -buildsimplenativepackage 'libfoo' 'amd64' '2' 'unstable' 'Multi-Arch: same' -buildsimplenativepackage 'unrelated-2' 'amd64' '2' 'unstable' +Recommends: unrelated" +buildsimplenativepackage 'libfoo' "${NATIVE}" '2' 'unstable' 'Multi-Arch: same' +buildsimplenativepackage 'unrelated-2' "${NATIVE}" '2' 'unstable' insertinstalledpackage 'foo' 'all' '1' insertinstalledpackage 'bar' 'all' '1' insertinstalledpackage 'stuff' 'all' '1' @@ -36,12 +37,12 @@ testsuccessequal 'Planner: dump' grep '^Planner: ' "$APT_EDSP_DUMP_FILENAME" testsuccess aptget install foo -s testsuccess aptget install foo -y testsuccess test -r "$EIPPLOG" -testsuccessequal 'Request: EIPP 0.1 -Architecture: amd64 -Architectures: amd64 -Remove: bar:amd64 -Install: libfoo:amd64 foo:amd64 -Planner: internal' head -n 6 "$EIPPLOG" +testsuccessequal "Request: EIPP 0.1 +Architecture: ${NATIVE} +Architectures: ${NATIVE} +Remove: bar:${NATIVE} +Install: libfoo:${NATIVE} foo:${NATIVE} +Planner: internal" head -n 6 "$EIPPLOG" aptinternalplanner < "$EIPPLOG" > planner.log || true testsuccessequal 'Remove: 6 Unpack: 2 @@ -53,11 +54,11 @@ rm -f "$EIPPLOG" testsuccess aptget install foo -s --reinstall testsuccess aptget install foo -y --reinstall testsuccess test -r "$EIPPLOG" -testsuccessequal 'Request: EIPP 0.1 -Architecture: amd64 -Architectures: amd64 -ReInstall: foo:amd64 -Planner: internal' head -n 5 "$EIPPLOG" +testsuccessequal "Request: EIPP 0.1 +Architecture: ${NATIVE} +Architectures: ${NATIVE} +ReInstall: foo:${NATIVE} +Planner: internal" head -n 5 "$EIPPLOG" aptinternalplanner < "$EIPPLOG" > planner.log || true testsuccessequal 'Unpack: 4 Configure: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planner.log @@ -66,10 +67,10 @@ rm -f "$EIPPLOG" testsuccess aptget purge foo -s testsuccess aptget purge foo -y testsuccess test -r "$EIPPLOG" -testsuccessequal 'Request: EIPP 0.1 -Architecture: amd64 -Architectures: amd64 -Remove: foo:amd64 -Planner: internal' head -n 5 "$EIPPLOG" +testsuccessequal "Request: EIPP 0.1 +Architecture: ${NATIVE} +Architectures: ${NATIVE} +Remove: foo:${NATIVE} +Planner: internal" head -n 5 "$EIPPLOG" aptinternalplanner < "$EIPPLOG" > planner.log || true testsuccessequal 'Remove: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planner.log |