summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-612099-multiarch-conflicts
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-10-11 14:37:03 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-10-11 14:37:03 +0200
commitea65d079e19231eee2b9a167384fac33c1534290 (patch)
tree1239a8bacb3373e6674ef0b09003ad8109cdb9b8 /test/integration/test-bug-612099-multiarch-conflicts
parentfa4d3cdc8a60e71fd3fef1c2a2cda6f80377445b (diff)
run integration tests on my new amd64 box without failures
Diffstat (limited to 'test/integration/test-bug-612099-multiarch-conflicts')
-rwxr-xr-xtest/integration/test-bug-612099-multiarch-conflicts7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts
index b8cfe59e2..dd9efb785 100755
--- a/test/integration/test-bug-612099-multiarch-conflicts
+++ b/test/integration/test-bug-612099-multiarch-conflicts
@@ -4,9 +4,7 @@ set -e
TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture "i386" "amd64"
-
-buildsimplenativepackage 'peace-dpkg' 'all' '1.0' 'stable'
+configarchitecture 'i386' 'amd64'
buildsimplenativepackage 'libc6' 'i386' '1.0' 'stable'
buildsimplenativepackage 'libc6' 'amd64' '1.0' 'stable'
@@ -17,9 +15,6 @@ buildsimplenativepackage 'foobar' 'amd64' '1.0' 'stable' 'Depends: libc6'
setupaptarchive
-aptget install peace-dpkg:i386 -y -qq 2>&1 > /dev/null
-testdpkginstalled peace-dpkg
-
aptget install libc6:i386 -t stable -y -qq 2>&1 > /dev/null
testdpkginstalled libc6
testequal 'Reading package lists...