diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-01-23 14:00:45 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-23 13:25:12 -0800 |
| commit | 60127996b506f14a98c1e7ac3cf14d6dc23d6b81 (patch) | |
| tree | 7993dc589e4844e8c8232519da62964a0d7b7179 | |
| parent | 9aebc4708ad21cc18f6d5c6909381abb0fe01023 (diff) | |
| download | git-60127996b506f14a98c1e7ac3cf14d6dc23d6b81.tar.gz | |
archive tests: use a cheaper "zipinfo -h" invocation to get header
Change an invocation of zipinfo added in 19ee29401d (t5004: test ZIP
archives with many entries, 2015-08-22) to simply ask zipinfo for the
header info, rather than spewing out info about the entire archive and
race to kill it with SIGPIPE due to the downstream "head -2".
I ran across this because I'm adding a "set -o pipefail" test
mode. This won't be needed for the version of the mode that I'm
introducing (which currently relies on a patch to GNU bash), but I
think this is a good idea anyway.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5004-archive-corner-cases.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh index 3e7b23cb32..2d32d0ed12 100755 --- a/t/t5004-archive-corner-cases.sh +++ b/t/t5004-archive-corner-cases.sh @@ -153,7 +153,8 @@ test_expect_success ZIPINFO 'zip archive with many entries' ' # check the number of entries in the ZIP file directory expr 65536 + 256 >expect && - "$ZIPINFO" many.zip | head -2 | sed -n "2s/.* //p" >actual && + "$ZIPINFO" -h many.zip >zipinfo && + sed -n "2s/.* //p" <zipinfo >actual && test_cmp expect actual ' |