X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c5ede4cac6e6496ce19ccea3313ac6b49ba5e8d6..3abb6a6a1e485b3bc899b64b0a1b7dc2db25a9c2:/test/integration/test-apt-ftparchive-src-cachedb?ds=sidebyside diff --git a/test/integration/test-apt-ftparchive-src-cachedb b/test/integration/test-apt-ftparchive-src-cachedb index 06f5bdd9d..8bab1fd5e 100755 --- a/test/integration/test-apt-ftparchive-src-cachedb +++ b/test/integration/test-apt-ftparchive-src-cachedb @@ -89,8 +89,8 @@ create_clearsigned_source_files() { # # main() # -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" setupenvironment configarchitecture "i386" confighashes 'MD5' 'SHA1' 'SHA256' 'SHA512' @@ -109,7 +109,7 @@ mkdir aptarchive-cache msgtest 'generate with --db option' cd aptarchive -aptftparchive --db ./test.db sources pool/main/ -q=0 -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail +aptftparchive --db ./test.db sources pool/main/ -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail testsuccess grep Misses stats-out.txt testfileequal '../rootdir/tmp/testsuccess.output' ' Misses in Cache: 2' cd .. @@ -117,7 +117,7 @@ assert_correct_sources_file msgtest 'generate with --db option (again to ensure its in the cache)' cd aptarchive -aptftparchive --db ./test.db sources pool/main/ -q=0 -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail +aptftparchive --db ./test.db sources pool/main/ -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail testsuccess grep Misses stats-out.txt testfileequal '../rootdir/tmp/testsuccess.output' ' Misses in Cache: 0' cd .. @@ -155,7 +155,7 @@ Tree "dists/test" { EOF msgtest 'generate (empty cachedb)' -testsuccess aptftparchive generate apt-ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1 +testsuccess aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 cp rootdir/tmp/testsuccess.output stats-out.txt testsuccess grep Misses stats-out.txt testfileequal rootdir/tmp/testsuccess.output ' Misses in Cache: 2' @@ -163,7 +163,7 @@ assert_correct_sources_file msgtest 'generate again out of the cache' rm -f ./aptarchive/dists/test/main/source/Sources -testsuccess aptftparchive generate apt-ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1 +testsuccess aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 cp rootdir/tmp/testsuccess.output stats-out.txt testsuccess grep Misses stats-out.txt testfileequal rootdir/tmp/testsuccess.output ' Misses in Cache: 0' @@ -183,7 +183,7 @@ rm -f aptarchive/pool/invalid/invalid_1.0.dsc # ensure clean works rm -f aptarchive/pool/main/* -testsuccess aptftparchive clean apt-ftparchive.conf -q=0 -o Debug::APT::FTPArchive::Clean=1 +testsuccess aptftparchive clean apt-ftparchive.conf -o Debug::APT::FTPArchive::Clean=1 cp rootdir/tmp/testsuccess.output clean-out.txt testsuccess grep unique clean-out.txt testfileequal 'rootdir/tmp/testsuccess.output' "0 Number of unique keys in the tree"