diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-06-09 20:41:58 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-06-10 15:25:12 +0200 |
| commit | 36feef0dc51c444de1449ba26a0bf2248716591d (patch) | |
| tree | 377533265faf277608f9045b7545232b139649f0 /test/integration/framework | |
| parent | 4331049f00c7a96edd7ce644a9a7036dd2722484 (diff) | |
do not hang on piped input in PipedFileFdPrivate
This effects only compressors configured on the fly (rather then the
inbuilt ones as they use a library).
(cherry picked from commit bdc42211700ef0f6f40e4ef3f362e52d684d70fb)
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 8 |
1 files changed, 6 insertions, 2 deletions
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 |