apt-key: change to / before find to satisfy its CWD needs

[apt.git] / test / integration / test-sourceslist-lang-plusminus-options

diff --git a/test/integration/test-sourceslist-lang-plusminus-options b/test/integration/test-sourceslist-lang-plusminus-options
index c61d5a4ca7b0e60956187d8bd9f7dd70db2ef536..abdb647933c59cd4e9c74d7d2756b4110da45f8a 100755 (executable)
--- a/test/integration/test-sourceslist-lang-plusminus-options
+++ b/test/integration/test-sourceslist-lang-plusminus-options
@@ -1,17 +1,17 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

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

 setupenvironment
 setupenvironment

-configarchitecture 'native'
+configarchitecture 'amd64'

 
 testlangs() {
        msgtest 'Test acquired languages for' "$1"
        local LANGS="$2"
        shift 2
        rm -f gotlangs.list
 
 testlangs() {
        msgtest 'Test acquired languages for' "$1"
        local LANGS="$2"
        shift 2
        rm -f gotlangs.list

-       aptget indextargets --no-release-info 'Created-By: Translations' "$@" --format '$(LANGUAGE)' | sort -u > gotlangs.list
+       aptget indextargets --no-release-info 'Identifier: Translations' "$@" --format '$(LANGUAGE)' | sort -u > gotlangs.list

        if [ -z "$LANGS" ]; then
                echo -n | tr ',' '\n' | sort | checkdiff - gotlangs.list && msgpass || msgfail
        else
        if [ -z "$LANGS" ]; then
                echo -n | tr ',' '\n' | sort | checkdiff - gotlangs.list && msgpass || msgfail
        else


@@ -44,7 +44,8 @@ testlangs 'lang=de_DE' 'de_DE'
 
 echo 'deb [lang=none] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list
 testlangs 'lang=none' ''
 
 echo 'deb [lang=none] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list
 testlangs 'lang=none' ''

-testequal 'amd64' aptget indextargets --no-release-info 'Created-By: Packages' --format '$(ARCHITECTURE)'
+testequal 'amd64
+all' aptget indextargets --no-release-info 'Identifier: Packages' --format '$(ARCHITECTURE)'

 
 echo 'deb [lang+=pt] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list
 testlangs 'lang+=pt' 'en,de,de_DE,pt'
 
 echo 'deb [lang+=pt] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list
 testlangs 'lang+=pt' 'en,de,de_DE,pt'