summaryrefslogtreecommitdiff
path: root/test/integration/test-apt-config
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-08-23 19:41:58 +0200
committerJulian Andres Klode <jak@debian.org>2016-08-26 22:17:54 +0200
commit8757a0fdeee00ea6a7cc717188a0e129ad8a553c (patch)
treecd13473faa06c189bfd915b835af065e6a2abf11 /test/integration/test-apt-config
parentdd7758b9245275a31fde70218db9a531c5859c26 (diff)
Make directory paths configurable
This allows other vendors to use different paths, or to build your own APT in /opt for testing. Note that this uses + 1 in some places, as the paths we receive are absolute, but we need to strip of the initial /.
Diffstat (limited to 'test/integration/test-apt-config')
-rwxr-xr-xtest/integration/test-apt-config2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-apt-config b/test/integration/test-apt-config
index abae83ee6..f2068b789 100755
--- a/test/integration/test-apt-config
+++ b/test/integration/test-apt-config
@@ -24,7 +24,7 @@ testsuccessequal "ARCH='amd64'" aptconfig shell ARCH APT::Architecture
ROOTDIR="$(readlink -f rootdir)"
testsuccessequal "CONFIG='apt.conf'" aptconfig shell CONFIG Dir::Etc::main
testsuccessequal "CONFIG='${ROOTDIR}/etc/apt/apt.conf'" aptconfig shell CONFIG Dir::Etc::main/f
-testsuccessequal "CONFIG='etc/apt/'" aptconfig shell CONFIG Dir::Etc
+testsuccessequal "CONFIG='etc/apt'" aptconfig shell CONFIG Dir::Etc
testsuccessequal "CONFIG='${ROOTDIR}/etc/apt/'" aptconfig shell CONFIG Dir::Etc/ # old style
testsuccessequal "CONFIG='${ROOTDIR}/etc/apt/'" aptconfig shell CONFIG Dir::Etc/d