add apt-key support for armored GPG key files (*.asc)

[apt.git] / test / integration / test-architecture-specification-parsing

diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing
index f5a5b123e7280213002e22f377b912b3a0aadef1..23199384e91f523c76b1580935aa49be95e79579 100755 (executable)
--- a/test/integration/test-architecture-specification-parsing
+++ b/test/integration/test-architecture-specification-parsing
@@ -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
 
 # we need this construct here as it isn't really possible to fake native arch for dpkg-* tools
 setupenvironment
 
 # we need this construct here as it isn't really possible to fake native arch for dpkg-* tools


@@ -28,7 +28,7 @@ setupaptarchive
 
 testsuccessequal "Reading package lists...
 Building dependency tree...
 
 testsuccessequal "Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo
 The following NEW packages will be installed:
   foo pkg-arch-foo
   foo
 The following NEW packages will be installed:
   foo pkg-arch-foo


@@ -48,7 +48,7 @@ Conf pkg-arch-no-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-no-foo -s
 
 testsuccessequal "Reading package lists...
 Building dependency tree...
 
 testsuccessequal "Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo
 The following NEW packages will be installed:
   foo pkg-arch-foo-unrelated-no
   foo
 The following NEW packages will be installed:
   foo pkg-arch-foo-unrelated-no


@@ -60,7 +60,7 @@ Conf pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])" aptget install pkg-arch
 
 testsuccessequal "Reading package lists...
 Building dependency tree...
 
 testsuccessequal "Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo
 The following NEW packages will be installed:
   foo pkg-arch-foo-unrelated-no2
   foo
 The following NEW packages will be installed:
   foo pkg-arch-foo-unrelated-no2


@@ -71,6 +71,7 @@ Conf foo (1.0 stable [${NATIVE}])
 Conf pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no2 -s
 
 testsuccessequal "Reading package lists...
 Conf pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no2 -s
 
 testsuccessequal "Reading package lists...

+Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo
 Building dependency tree...
 The following NEW packages will be installed:
   foo


@@ -79,10 +80,13 @@ Inst foo (1.0 stable [${NATIVE}])
 Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo -s
 
 testsuccessequal 'Reading package lists...
 Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo -s
 
 testsuccessequal 'Reading package lists...

+pkg-arch-no-foo has no build depends.
+Reading package lists...

 Building dependency tree...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s
 
 testsuccessequal "Reading package lists...
 Building dependency tree...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s
 
 testsuccessequal "Reading package lists...

+Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo
 Building dependency tree...
 The following NEW packages will be installed:
   foo


@@ -91,6 +95,7 @@ Inst foo (1.0 stable [${NATIVE}])
 Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no -s
 
 testsuccessequal "Reading package lists...
 Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no -s
 
 testsuccessequal "Reading package lists...

+Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo
 Building dependency tree...
 The following NEW packages will be installed:
   foo


@@ -99,6 +104,8 @@ Inst foo (1.0 stable [${NATIVE}])
 Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no2 -s
 
 testsuccessequal 'Reading package lists...
 Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no2 -s
 
 testsuccessequal 'Reading package lists...

+no-depends has no build depends.
+Reading package lists...

 Building dependency tree...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s
 
 Building dependency tree...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s