Re: [PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB
- From
René Scharfe <l.s.r@web.de>
- Date
- Apr 30, 2017, 07:53 UTC
- Message-ID
- <d8a1edfc-e4d6-2bd2-7b07-a1a10d89490a@web.de>
- In-Reply-To
- <e30554f3-1aa3-acea-500b-6392fce902be@web.de>
Am 30.04.2017 um 07:31 schrieb Torsten Bögershausen:
Show 34 quoted lines
> Sorry, I was not looking careful enough, the macro `$GIT_UNZIP` > gave the impression that an unzip provided by Git (or the Git test > framework) was used :-( > > $ which unzip > /usr/bin/unzip > > $ unzip -v > UnZip 5.52 of 28 February 2005, by Info-ZIP. Maintained by C. Spieler. > Send > bug reports using http://www.info-zip.org/zip-bug.html; see README for > details. > > Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ; > see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites. > > Compiled with gcc 4.2.1 Compatible Apple LLVM 7.0.0 (clang-700.0.59.1) > for Unix on Aug 1 2015. > > UnZip special compilation options: > COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported) > SET_DIR_ATTRIB > TIMESTAMP > USE_EF_UT_TIME > USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported) > USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported) > VMS_TEXT_CONV > [decryption, version 2.9 of 05 May 2000] > > UnZip and ZipInfo environment options: > UNZIP: [none] > UNZIPOPT: [none] > ZIPINFO: [none] > ZIPINFOOPT: [none]
OK, so they indeed still ship the old version of unzip that doesn't support big files.
> ok 13 # skip zip archive with files bigger than 4GB (missing ZIPINFO of > EXPENSIVE,UNZIP,ZIPINFO)
And if you had zipinfo then this test would certainly fail.
Anyway, thanks for running these expensive tests! You could retry with unzip version 6.00 and its zipinfo if you want. But we certainly need the following patch:
-- >8 -- Subject: [PATCH] t5004: require 64-bit support for big ZIP tests
Check if unzip supports the ZIP64 format and skip the tests that create big archives otherwise. Also skip the test that archives a big file on 32-bit platforms because the git object systems can't unpack files bigger than 4GB there.
Reported-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Rene Scharfe <l.s.r@web.de> --- t/t5004-archive-corner-cases.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh index 9106c53c4c..fd23c75f59 100755 --- a/t/t5004-archive-corner-cases.sh +++ b/t/t5004-archive-corner-cases.sh @@ -27,6 +27,9 @@ check_dir() { test_cmp expect actual } +test_lazy_prereq UNZIP_ZIP64_SUPPORT ' + "$GIT_UNZIP" -v | grep ZIP64_SUPPORT +' # bsdtar/libarchive versions before 3.1.3 consider a tar file with a # global pax header that is not followed by a file record as corrupt. @@ -155,7 +158,8 @@ test_expect_success ZIPINFO 'zip archive with many entries' ' test_cmp expect actual ' -test_expect_success EXPENSIVE,UNZIP 'zip archive bigger than 4GB' ' +test_expect_success EXPENSIVE,UNZIP,UNZIP_ZIP64_SUPPORT \ + 'zip archive bigger than 4GB' ' # build string containing 65536 characters s=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef && s=$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s && @@ -178,7 +182,8 @@ test_expect_success EXPENSIVE,UNZIP 'zip archive bigger than 4GB' ' "$GIT_UNZIP" -t many-big.zip ' -test_expect_success EXPENSIVE,UNZIP,ZIPINFO 'zip archive with files bigger than 4GB' ' +test_expect_success EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO \ + 'zip archive with files bigger than 4GB' ' # Pack created with: # dd if=/dev/zero of=file bs=1M count=4100 && git hash-object -w file mkdir -p .git/objects/pack &&
-- 2.12.2