X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/39f96d07cfe61f5e87279a704baed85f1468bc57..561a3557e7fa6c4ed693c3bb486d189a468a8080:/test/integration/test-bug-661537-build-profiles-support

diff --git a/test/integration/test-bug-661537-build-profiles-support b/test/integration/test-bug-661537-build-profiles-support
index b4f6fb916..d24484de9 100755
--- a/test/integration/test-bug-661537-build-profiles-support
+++ b/test/integration/test-bug-661537-build-profiles-support
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'amd64' 'i386' 'armel'
 
@@ -25,6 +25,7 @@ insertsource 'unstable' 'spec-7' 'any' '1' 'Build-Depends: foo <stage1> <!notest
 setupaptarchive
 
 testsuccessequal 'Reading package lists...
+Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   bar
@@ -59,6 +60,7 @@ Inst bar (1.0 unstable [all])
 Conf bar (1.0 unstable [all])' aptget build-dep buildprofiles -s -o APT::Architecture=i386 -P stage1
 
 KEEP='Reading package lists...
+Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   foo
@@ -67,13 +69,14 @@ Inst foo (1.0 unstable [all])
 Conf foo (1.0 unstable [all])'
 setdrop() {
 	DROP="Reading package lists...
-Building dependency tree...
 $1 has no build depends.
+Reading package lists...
+Building dependency tree...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded."
 }
 
 msgtest 'Check if version of installed dpkg is high enough for' 'build profiles support'
-if dpkg --compare-versions "$(command dpkg-query --showformat='${Version}' --show dpkg)" 'ge' '1.17.14'; then
+if dpkg --compare-versions "$(dpkg_version)" 'ge' '1.17.14'; then
 	msgpass
 	testwithdpkg() {
 		msgtest "Test with" "dpkg-checkbuilddeps -d '$1' -P '$2'"
@@ -114,6 +117,7 @@ testprofile() {
 	testwithdpkg "$2" "$3" "$4"
 }
 
+testsuccess aptcache gencaches
 setdrop 'spec-1'
 testprofile 'spec-1' 'foo <!stage1>' '' "$KEEP"
 testprofile 'spec-1' 'foo <!stage1>' 'stage1' "$DROP"