diff options
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 5 | ||||
| -rw-r--r-- | test/integration/framework | 8 | ||||
| -rwxr-xr-x | test/integration/test-apt-helper-cat-file | 30 | ||||
| -rwxr-xr-x | test/integration/test-compressed-indexes | 2 |
4 files changed, 42 insertions, 3 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index cde005eb5..d880a725d 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1974,6 +1974,11 @@ public: virtual bool InternalClose(std::string const &) APT_OVERRIDE { bool Ret = true; + if (filefd->iFd != -1) + { + close(filefd->iFd); + filefd->iFd = -1; + } if (compressor_pid > 0) Ret &= ExecWait(compressor_pid, "FileFdCompressor", true); compressor_pid = -1; diff --git a/test/integration/framework b/test/integration/framework index d020d4a7d..ca0a3b5de 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -528,6 +528,10 @@ EOF testempty --nomsg gcc -Wall -Wextra -fPIC -shared -o noopchroot.so noopchroot.c -ldl } configcompression() { + if [ "$1" = 'ALL' ]; then + configcompression '.' $(aptconfig dump APT::Compressor --format '%t %v%n' | sed -n 's#^Extension \.\(.*\)$#\1#p') + return + fi local CMD='apthelper cat-file -C' while [ -n "$1" ]; do case "$1" in @@ -952,7 +956,7 @@ buildaptarchivefromfiles() { } compressfile() { - cat "${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf" | while read compressor extension command; do + while read compressor extension command; do if [ "$compressor" = '.' ]; then if [ -n "$2" ]; then touch -d "$2" "$1" @@ -963,7 +967,7 @@ compressfile() { if [ -n "$2" ]; then touch -d "$2" "${1}.${extension}" fi - done + done < "${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf" } # can be overridden by testcases for their pleasure diff --git a/test/integration/test-apt-helper-cat-file b/test/integration/test-apt-helper-cat-file new file mode 100755 index 000000000..f7c94a2b4 --- /dev/null +++ b/test/integration/test-apt-helper-cat-file @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" +setupenvironment + +cat >rootdir/etc/apt/apt.conf.d/rev-as-compressor <<EOF +APT::Compressor::rev { + Name "rev"; + Extension ".rev"; + Binary "rev"; + Cost "1"; +}; +EOF + +configcompression 'ALL' +cat >./test.txt <<EOF +This is a test. +EOF + +compressfile ./test.txt +while read compressor extension command; do + if [ "$compressor" = '.' ]; then + FILE='./test.txt' + else + FILE="./test.txt.${extension}" + fi + testsuccessequal "$(cat ./test.txt)" apthelper cat-file "$FILE" +done < "${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf" diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes index 7ddf2e2e2..b7e84300e 100755 --- a/test/integration/test-compressed-indexes +++ b/test/integration/test-compressed-indexes @@ -5,7 +5,7 @@ TESTDIR="$(readlink -f "$(dirname "$0")")" . "$TESTDIR/framework" setupenvironment -configcompression '.' $(aptconfig dump APT::Compressor --format '%t %v%n' | sed -n 's#^Extension \.\(.*\)$#\1#p') +configcompression 'ALL' configarchitecture 'i386' LOWCOSTEXT='lz4' |